fix: allow both google and gcp provider (#827)

* fix: allow both google and gcp provider

Signed-off-by: David van der Spek <[email protected]>

* fix: also update postgres

Signed-off-by: David van der Spek <[email protected]>

---------

Signed-off-by: David van der Spek <[email protected]>

Author: davidspek

airflow/helm/airflow/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: airflow
 description: A Helm chart for airflow deployable on plural
 type: application
-version: 0.3.38
+version: 0.3.39
 appVersion: "2.6.3"
 sources:
   - https://github.com/pluralsh/plural-artifacts/airflow/helm/airflow

airflow/helm/airflow/values.yaml.tpl

@@ -1,3 +1,4 @@
+{{ $isGcp := or (eq .Provider "google") (eq .Provider "gcp") }}
 global:
   application:
     links:
@@ -80,13 +81,13 @@ airflow:
               else:
                   return {}
           oauth_user_info = _get_oauth_user_info
-        
+
         SECURITY_MANAGER_CLASS = PluralSecurityManager
 
         SQLALCHEMY_DATABASE_URI = conf.get('core', 'SQL_ALCHEMY_CONN')
-        
+
         AUTH_TYPE = AUTH_OAUTH
-        
+
         # registration configs
         AUTH_USER_REGISTRATION = True  # allow users who are not already in the FAB DB
         AUTH_USER_REGISTRATION_ROLE = "Admin"  # this role will be given in addition to any AUTH_ROLES_MAPPING
@@ -112,7 +113,7 @@ airflow:
                 }
             }
         ]
-        
+
         # force users to re-auth after 30min of inactivity (to keep roles in sync)
         PERMANENT_SESSION_LIFETIME = 1800
   {{ end }}
@@ -129,7 +130,7 @@ airflow:
   airflow:
     config:
       AIRFLOW__WEBSERVER__BASE_URL: https://{{ $hostname }}
-    {{ if eq .Provider "google" }}
+    {{ if $isGcp }}
       AIRFLOW__LOGGING__REMOTE_BASE_LOG_FOLDER: "gs://{{ .Values.airflowBucket }}/airflow/logs"
     {{ end }}
     {{ if or (eq .Provider "aws") (eq .Provider "azure") (eq .Provider "kind") }}
@@ -138,8 +139,8 @@ airflow:
     {{ if or (eq .Provider "azure") (eq .Provider "kind") }}
       AIRFLOW__LOGGING__REMOTE_LOG_CONN_ID: minio
     {{ end }}
-  
-    {{ if eq .Provider "google" }}
+
+    {{ if $isGcp }}
     connections:
     ## see docs: https://airflow.apache.org/docs/apache-airflow-providers-google/stable/connections/gcp.html
     - id: plural
@@ -180,7 +181,7 @@ airflow:
     {{ end }}
 
   serviceAccount:
-  {{ if eq .Provider "google" }}
+  {{ if $isGcp }}
     create: false
   {{ end }}
     annotations:

argo-workflows/helm/argo-workflows/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.28
+version: 0.1.29
 appVersion: "v3.2.9"
 dependencies:
 - name: argo-workflows

argo-workflows/helm/argo-workflows/values.yaml.tpl

@@ -1,3 +1,4 @@
+{{ $isGcp := or (eq .Provider "google") (eq .Provider "gcp") }}
 {{- if .OIDC }}
 oidcSecret:
   clientID: {{ .OIDC.ClientId }}
@@ -79,7 +80,7 @@ artifactRepository:
       name: minio-secret
       key: secret-key
   {{ end }}
-  {{ if eq .Provider "google" }}
+  {{ if $isGcp }}
   gcs:
     bucket: {{ .Values.workflowBucket | quote }}
   {{ end }}
@@ -99,7 +100,7 @@ serviceAccount:
   annotations:
     eks.amazonaws.com/role-arn: "arn:aws:iam::{{ .Project }}:role/{{ .Cluster }}-argo-workflows"
   {{- end }}
-  {{ if eq .Provider "google" }}
+  {{ if $isGcp }}
   annotations:
     iam.gke.io/gcp-service-account: {{ importValue "Terraform" "service_account_email" }}
   {{ end }}

bootstrap/helm/bootstrap/Chart.yaml

@@ -10,7 +10,7 @@ maintainers:
   email: [email protected]
 - name: David van der Spek
   email: [email protected]
-version: 0.8.71
+version: 0.8.72
 dependencies:
 - name: external-dns
   version: 6.14.1

bootstrap/helm/bootstrap/templates/defaultstorageclass.yaml

@@ -6,7 +6,7 @@ metadata:
   labels: {{ include "bootstrap.labels" . | nindent 4 }}
 spec:
   name: ebs-csi
-{{- else if eq .Values.provider "google" }}
+{{- else if or (eq .Values.provider "google") (eq .Values.provider "gcp") }}
 apiVersion: platform.plural.sh/v1alpha1
 kind: DefaultStorageClass
 metadata:

bootstrap/helm/bootstrap/templates/snapshot.yaml

@@ -7,7 +7,7 @@ metadata:
     snapshot.storage.kubernetes.io/is-default-class: "true"
 driver: ebs.csi.aws.com
 deletionPolicy: Delete
-{{- else if eq .Values.provider "google" }}
+{{- else if or (eq .Values.provider "google") (eq .Values.provider "gcp") }}
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshotClass
 metadata:

bootstrap/helm/bootstrap/values.yaml.tpl

@@ -1,3 +1,4 @@
+{{ $isGcp := or (eq .Provider "google") (eq .Provider "gcp") }}
 {{ $pluraldns := .Network.PluralDns }}
 {{ $providerArgs := dict "provider" .Provider "cluster" .Cluster }}
 {{ if eq .Provider "google" }}
@@ -10,6 +11,8 @@ external-dns:
   extraArgs:
     plural-cluster: {{ $providerArgs.cluster }}
     plural-provider: {{ $providerArgs.provider }}
+  {{ else if $isGcp }}
+  provider: google
   {{ else }}
   provider: {{ .Provider }}
   {{ end }}
@@ -21,7 +24,7 @@ external-dns:
   rbac:
     create: true
   serviceAccount:
-{{ if eq .Provider "google" }}
+{{ if $isGcp }}
     create: false
 {{ end }}
     name: {{ default "external-dns" .Values.externaldns_service_account }}
@@ -31,7 +34,7 @@ external-dns:
     {{- end }}
   domainFilters:
   - {{ .Network.Subdomain }}
-  {{- if eq .Provider "google" }}
+  {{- if $isGcp }}
   google:
     project: {{ .Project }}
   {{- end }}
@@ -85,8 +88,8 @@ regcreds:
 provider: {{ .Provider }}
 ownerEmail: {{ .Config.Email }}
 
-{{ if eq (default "google" .Provider) "aws" }}
-{{- if not .Values.disable_cluster_autoscaler }} 
+{{ if eq .Provider "aws" }}
+{{- if not .Values.disable_cluster_autoscaler }}
 cluster-autoscaler:
   enabled: true
   awsRegion: {{ .Region }}
@@ -179,7 +182,7 @@ dnsSolver:
     environment: AzurePublicCloud
 {{ end }}
 
-{{ if eq .Provider "google" }}
+{{ if $isGcp }}
 cert-manager:
   serviceAccount:
     create: false

chatwoot/helm/chatwoot/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: chatwoot
 description: Open-source customer engagement suite, an alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 type: application
-version: 0.1.7
+version: 0.1.8
 appVersion: v2.15.0
 dependencies:
 - name: chatwoot

chatwoot/helm/chatwoot/values.yaml.tpl

@@ -1,3 +1,4 @@
+{{ $isGcp := or (eq .Provider "google") (eq .Provider "gcp") }}
 {{- $redisNamespace := namespace "redis" }}
 {{ $redisValues := .Applications.HelmValues "redis" }}
 global:
@@ -8,7 +9,7 @@ global:
 
 chatwoot:
   serviceAccount:
-    {{- if eq .Provider "google" }}
+    {{- if $isGcp }}
     create: false
     {{- end }}
     name: chatwoot
@@ -41,7 +42,7 @@ chatwoot:
     ACTIVE_STORAGE_SERVICE: amazon
     S3_BUCKET_NAME: {{ .Values.chatwootBucket }}
     AWS_REGION: {{ .Region }}
-    {{- else if eq .Provider "google" }}
+    {{- else if $isGcp }}
     ACTIVE_STORAGE_SERVICE: google
     GCS_PROJECT: {{ .Project }}
     GCS_BUCKET: {{ .Values.chatwootBucket }}