WIP Initial refactoring of deployments

Author: PJEstrada

templates/default/deployment.yaml

@@ -15,8 +15,10 @@ spec:
       labels:
         app: diffgram-default
     spec:
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: diffgramsecret
+      {{ end }}
       volumes:
       - name: service-account-credentials-volume
         secret:
@@ -39,7 +41,12 @@ spec:
         command: ['sh', '-c', 'until pg_isready -h postgres-azure-service -p 5432; do echo waiting for database; sleep 2; done;']
         {{ end }}
       containers:
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       - image: gcr.io/diffgram-enterprise/default:{{ .Values.diffgramVersion }}
+      {{ end }}
+      {{ if eq .Values.diffgramEdition "opencore"}}
+      - image: gcr.io/diffgram-open-core/default:{{ .Values.diffgramVersion }}
+      {{ end }}
         imagePullPolicy: Always
         name: diffgram-default
         ports:

templates/frontend/deployment.yaml

@@ -15,10 +15,17 @@ spec:
       labels:
         app: frontend
     spec:
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: diffgramsecret
+      {{ end }}
       containers:
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       - image: gcr.io/diffgram-enterprise/frontend:{{ .Values.diffgramVersion }}
+      {{ end }}
+      {{ if eq .Values.diffgramEdition "opencore"}}
+      - image: gcr.io/diffgram-open-core/frontend:{{ .Values.diffgramVersion }}
+      {{ end }}
         imagePullPolicy: Always
         name: frontend
         resources:

templates/hooks/database_pre_install.yaml

@@ -23,8 +23,10 @@ spec:
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
       restartPolicy: Never
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       imagePullSecrets:
       - name: db-migrations-pull-secret
+      { {end }}
       volumes:
       - name: service-account-credentials-volume-hook
         secret:
@@ -33,7 +35,12 @@ spec:
           - key: sa_json
             path: sa_credentials.json
       containers:
+      {{ if eq .Values.diffgramEdition "enterprise"}}
       - image: gcr.io/diffgram-enterprise/default:{{ .Values.diffgramVersion }}
+      {{ end }}
+      {{ if eq .Values.diffgramEdition "opencore"}}
+      - image: gcr.io/diffgram-open-core/default:{{ .Values.diffgramVersion }}
+      {{ end }}
         imagePullPolicy: Always
         name: pre-upgrade-alembic-hook
         volumeMounts:

values.yaml

@@ -5,6 +5,10 @@
 # The Diffgram Version. Whenever a new update arrives, this will be changed.
 diffgramVersion: latest
 
+# Either 'opencore' or 'enterprise'. Please note that selecting 'enterprise'
+# requires that you also set imagePullCredentials.gcrCredentials.
+diffgramEdition: opencore
+
 # Set this to your public domain where you want diffgram to be.
 diffgramDomain: example.com