Fix GCE where no cloud-config-path is required

kubernetes · Mar 15, 2021 · 3bdfd86 · 3bdfd86
1 parent 5d05268
commit 3bdfd86
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
@@ -70,7 +70,7 @@ spec:
             - --cluster-name={{ .Values.magnumClusterName }}
             {{- end }}
           {{- end }}
-          {{- if or (eq .Values.cloudProvider "gce") (eq .Values.cloudProvider "magnum") }}
+          {{- if eq .Values.cloudProvider "magnum" }}
             - --cloud-config={{ .Values.cloudConfigPath }}
           {{- end }}
           {{- range $key, $value := .Values.extraArgs }}
@@ -182,9 +182,9 @@ spec:
           securityContext:
             {{ toYaml .Values.containerSecurityContext | nindent 12 | trim }}
           {{- end }}
-          {{- if or (eq .Values.cloudProvider "gce") (eq .Values.cloudProvider "magnum") .Values.extraVolumeSecrets .Values.extraVolumeMounts }}
+          {{- if or (eq .Values.cloudProvider "magnum") .Values.extraVolumeSecrets .Values.extraVolumeMounts }}
           volumeMounts:
-          {{- if or (eq .Values.cloudProvider "gce") (eq .Values.cloudProvider "magnum") }}
+          {{- if eq .Values.cloudProvider "magnum" }}
             - name: cloudconfig
               mountPath: {{ .Values.cloudConfigPath }}
               readOnly: true
@@ -218,9 +218,9 @@ spec:
       securityContext:
         {{ toYaml .Values.securityContext | nindent 8 | trim }}
       {{- end }}
-      {{- if or (eq .Values.cloudProvider "gce") (eq .Values.cloudProvider "magnum") .Values.extraVolumeSecrets .Values.extraVolumes }}
+      {{- if or (eq .Values.cloudProvider "magnum") .Values.extraVolumeSecrets .Values.extraVolumes }}
       volumes:
-      {{- if or (eq .Values.cloudProvider "gce") (eq .Values.cloudProvider "magnum") }}
+      {{- if eq .Values.cloudProvider "magnum" }}
         - name: cloudconfig
           hostPath:
             path: {{ .Values.cloudConfigPath }}