Always use GOOGLE_APPLICATION_CREDENTIALS env in acaas (#1275)

Signed-off-by: Arnob Kumar Saha <arnob@appscode.com>

Author: ArnobKumarSaha

charts/accounts-ui/templates/deployment.yaml

@@ -74,7 +74,7 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}

charts/billing/templates/aggregator/cronjob.yaml

@@ -44,7 +44,7 @@ spec:
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}
               env:
-              {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+              {{- if (include "settings.objstoreSecretName" .) }}
                 - name: GOOGLE_APPLICATION_CREDENTIALS
                   value: {{ $infra.objstore.mountPath }}/sa.json
               {{- end }}

charts/billing/templates/aggregator/statefulset.yaml

@@ -65,7 +65,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}

charts/billing/templates/processor/statefulset.yaml

@@ -65,7 +65,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.name
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}

charts/marketplace-api/templates/deployment.yaml

@@ -68,7 +68,7 @@ spec:
           {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}

charts/platform-links/templates/deployment.yaml

@@ -89,7 +89,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          {{- if and (include "settings.objstoreSecretName" .) (eq $infra.objstore.provider "gcs") }}
+          {{- if (include "settings.objstoreSecretName" .) }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: {{ $infra.objstore.mountPath }}/sa.json
           {{- end }}