diffgram · PJEstrada · Oct 5, 2022 · Oct 4, 2022 · Oct 5, 2022
diff --git a/README.md b/README.md
@@ -17,32 +17,6 @@ To have the ingress enabled, otherwise you won't be able to acess your diffgram
 
 If you are not on minikube, you can use the Nginx K8s Ingress Controller. Check how to install on your cloud provider here: https://kubernetes.github.io/ingress-nginx/deploy/
 
-### Opencore or Enterprise
-
-Make sure you set the value of  `diffgramEdition` in the `values.yaml` to either `opencore`
-or `enterprise`.
-
-If you set the `diffgramEdition` to `enterprise` you will have to provide the GCR credentials 
-Key (Provided by the Diffgram Team). And set the value on `imagePullCredentials.gcrCredentials` value inside the `values.yaml` file.
-### Setting Up the Docker Registry Key (Enterprise Only):
-
-To install the helm chart with the Enterprise Edition of Diffgram you will need to receive a GCR key with the permissions from
-the Diffgram team to fetch our images.
-
-Please Contact us if you want  to get one here:  https://diffgram.com/contact
-
-Once you have your GCR Key please set it in the `values.yaml` file, specifically inside the
-key `imagePullCredentials.gcrCredentials`.
-
-
-```
-imagePullCredentials:
-  # The service account with permissions to pull from the GCR Repository. [Should be Provided by Diffgram Team.]
-  gcrCredentials: <YOUR KEY GOES HERE>
-```
-
-
-
 ### TLS Ceritificates
 #### Using minikube (For local testing) 
 Install Cert Manager

diff --git a/templates/default/deployment.yaml b/templates/default/deployment.yaml
@@ -19,10 +19,6 @@ spec:
       nodeSelector:
         poolName: {{ .Values.nodeGroupLabel }}
       {{ end }}
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      imagePullSecrets:
-      - name: diffgramsecret
-      {{ end }}
       volumes:
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       - name: service-account-credentials-volume
@@ -47,12 +43,7 @@ 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 }}
+      - image: diffgram/default:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: diffgram-default
         ports:

diff --git a/templates/eventhandlers/deployment.yaml b/templates/eventhandlers/deployment.yaml
@@ -19,10 +19,6 @@ spec:
       nodeSelector:
         poolName: {{ .Values.nodeGroupLabel }}
       {{ end }}
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      imagePullSecrets:
-      - name: diffgramsecret
-      {{ end }}
       volumes:
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       - name: service-account-credentials-volume
@@ -47,12 +43,7 @@ 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/eventhandlers:{{ .Values.diffgramVersion }}
-      {{ end }}
-      {{ if eq .Values.diffgramEdition "opencore"}}
-      - image: gcr.io/diffgram-open-core/eventhandlers:{{ .Values.diffgramVersion }}
-      {{ end }}
+      - image: diffgram/eventhandlers:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: diffgram-eventhandlers
         ports:

diff --git a/templates/frontend/deployment.yaml b/templates/frontend/deployment.yaml
@@ -20,17 +20,8 @@ spec:
       nodeSelector:
         poolName: {{ .Values.nodeGroupLabel }}
       {{ end }}
-      {{ 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 }}
+      - image: diffgram/frontend:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: frontend
         resources:

diff --git a/templates/hooks/database_pre_install.yaml b/templates/hooks/database_pre_install.yaml
@@ -27,10 +27,6 @@ spec:
         poolName: {{ .Values.nodeGroupLabel }}
       {{ end }}
       restartPolicy: Never
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      imagePullSecrets:
-      - name: db-migrations-pull-secret
-      {{ end }}
       volumes:
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       - name: service-account-credentials-volume-hook
@@ -46,12 +42,7 @@ spec:
           claimName: postgres-pv-claim
       {{ 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 }}
+      - image: diffgram/default:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: pre-upgrade-alembic-hook
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}

diff --git a/templates/hooks/database_pre_upgrade.yaml b/templates/hooks/database_pre_upgrade.yaml
@@ -22,10 +22,6 @@ spec:
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
       restartPolicy: Never
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      imagePullSecrets:
-      - name: diffgramsecret
-      {{ end }}
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       volumes:
       - name: service-account-credentials-volume-hook
@@ -36,12 +32,7 @@ spec:
             path: sa_credentials.json
       {{ 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 }}
+      - image: diffgram/default:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: pre-upgrade-alembic-hook
        {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}

diff --git a/templates/hooks/secret_gcr_db_migrations.yaml b/templates/hooks/secret_gcr_db_migrations.yaml
diff --git a/templates/postgres/service.yaml b/templates/postgres/service.yaml
@@ -9,7 +9,6 @@ metadata:
     # job is considered part of the release.
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "-2"
-    "helm.sh/hook-delete-policy": hook-failed
 spec:
   ports:
     - port: 5432

diff --git a/templates/secret-gcr.yaml b/templates/secret-gcr.yaml
diff --git a/templates/walrus/deployment.yaml b/templates/walrus/deployment.yaml
@@ -19,10 +19,6 @@ spec:
       nodeSelector:
         poolName: {{ .Values.nodeGroupLabel }}
       {{ end }}
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      imagePullSecrets:
-      - name: diffgramsecret
-      {{ end }}
       volumes:
       {{ if eq .Values.diffgramSettings.DIFFGRAM_STATIC_STORAGE_PROVIDER "gcp"}}
       - name: service-account-credentials-volume
@@ -53,12 +49,7 @@ spec:
           do echo waiting for database; sleep 2; done;']
         {{ end }}
       containers:
-      {{ if eq .Values.diffgramEdition "enterprise"}}
-      - image: gcr.io/diffgram-enterprise/walrus:{{ .Values.diffgramVersion }}
-      {{ end }}
-      {{ if eq .Values.diffgramEdition "opencore"}}
-      - image: gcr.io/diffgram-open-core/walrus:{{ .Values.diffgramVersion }}
-      {{ end }}
+      - image: diffgram/walrus:{{ .Values.diffgramVersion }}
         imagePullPolicy: Always
         name: diffgram-walrus
         ports:

diff --git a/values.yaml b/values.yaml
@@ -5,10 +5,6 @@
 # The Diffgram Version. Whenever a new update arrives, this will be changed.
 diffgramVersion: 1.4.3
 
-# 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.
 # This must be a domain name and not a public IP address.
 # The chart will generate TLS certificates for the provided domain if useCertManager is 'true'
@@ -112,7 +108,7 @@ diffgramSettings:
   EMAIL_VALIDATION: '"False"' # Turns on email verification for new accounts.
   EMAIL_DOMAIN_NAME: example.com
   SMTP_HOST: none
-  SMTP_PORT: none
+  SMTP_PORT: '"465"'
   SMTP_USERNAME: none
   SMTP_FROM_EMAIL: none
 
@@ -133,11 +129,6 @@ diffgramSettings:
   KEY_CLOAK_DIFFGRAM_USER: '"admin"'
   KEYCLOAK_REALM: '"admin"'
 
-imagePullCredentials:
-  # The service account with permissions to pull from the GCR Repository. [Should be Provided by Diffgram Team.]
-  gcrCredentials: provided_by_diffgram_team
-
-
 ####### Dependencies
 # Read: https://github.com/bitnami/charts/tree/master/bitnami/rabbitmq for further configs
 useRabbitMq: true