diff --git a/config/dev/azure-managedcluster.yaml b/config/dev/azure-managedcluster.yaml index d0e563797..830b47553 100644 --- a/config/dev/azure-managedcluster.yaml +++ b/config/dev/azure-managedcluster.yaml @@ -4,7 +4,7 @@ metadata: name: azure-dev namespace: ${NAMESPACE} spec: - template: azure-standalone-cp-0-0-2 + template: azure-standalone-cp-0-0-3 credential: azure-cluster-identity-cred config: controlPlaneNumber: 1 @@ -15,9 +15,6 @@ spec: vmSize: Standard_A4_v2 worker: vmSize: Standard_A4_v2 - clusterIdentity: - name: azure-cluster-identity - namespace: ${NAMESPACE} tenantID: "${AZURE_TENANT_ID}" clientID: "${AZURE_CLIENT_ID}" clientSecret: "${AZURE_CLIENT_SECRET}" diff --git a/templates/cluster/azure-hosted-cp/Chart.yaml b/templates/cluster/azure-hosted-cp/Chart.yaml index 1a614b992..36cc4a85f 100644 --- a/templates/cluster/azure-hosted-cp/Chart.yaml +++ b/templates/cluster/azure-hosted-cp/Chart.yaml @@ -7,7 +7,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.2 +version: 0.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml b/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml index 83f4ad67b..856da34f6 100644 --- a/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml +++ b/templates/cluster/azure-hosted-cp/templates/k0smotroncontrolplane.yaml @@ -25,14 +25,14 @@ spec: extensions: helm: repositories: - - name: cloud-provider-azure - url: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo + - name: mirantis + url: https://charts.mirantis.com - name: azuredisk-csi-driver url: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts charts: - name: cloud-provider-azure namespace: kube-system - chartname: cloud-provider-azure/cloud-provider-azure + chartname: mirantis/cloud-provider-azure version: 1.31.2 order: 1 values: | diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml index 16c716767..c8c90e5c1 100644 --- a/templates/cluster/azure-standalone-cp/Chart.yaml +++ b/templates/cluster/azure-standalone-cp/Chart.yaml @@ -6,7 +6,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.2 +version: 0.0.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml b/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml index 78baf6484..415108296 100644 --- a/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml +++ b/templates/cluster/azure-standalone-cp/templates/k0scontrolplane.yaml @@ -27,14 +27,14 @@ spec: extensions: helm: repositories: - - name: cloud-provider-azure - url: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo + - name: mirantis + url: https://charts.mirantis.com - name: azuredisk-csi-driver url: https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts charts: - name: cloud-provider-azure namespace: kube-system - chartname: cloud-provider-azure/cloud-provider-azure + chartname: mirantis/cloud-provider-azure version: 1.31.2 order: 1 values: | diff --git a/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml b/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-3.yaml similarity index 75% rename from templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml rename to templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-3.yaml index dd7570c10..64cd4ebab 100644 --- a/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-2.yaml +++ b/templates/provider/hmc-templates/files/templates/azure-hosted-cp-0-0-3.yaml @@ -1,10 +1,10 @@ apiVersion: hmc.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: azure-hosted-cp-0-0-2 + name: azure-hosted-cp-0-0-3 annotations: helm.sh/resource-policy: keep spec: helm: chartName: azure-hosted-cp - chartVersion: 0.0.2 + chartVersion: 0.0.3 diff --git a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml similarity index 74% rename from templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml rename to templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml index d07a5d866..8b867c342 100644 --- a/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-2.yaml +++ b/templates/provider/hmc-templates/files/templates/azure-standalone-cp-0-0-3.yaml @@ -1,10 +1,10 @@ apiVersion: hmc.mirantis.com/v1alpha1 kind: ClusterTemplate metadata: - name: azure-standalone-cp-0-0-2 + name: azure-standalone-cp-0-0-3 annotations: helm.sh/resource-policy: keep spec: helm: chartName: azure-standalone-cp - chartVersion: 0.0.2 + chartVersion: 0.0.3