Allow explicit setting of pullSecret for registry

CodeTogether-Inc · Oct 25, 2023 · 53c29eb · 53c29eb
1 parent c607698
commit 53c29eb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/charts/hq/Chart.yaml b/charts/hq/Chart.yaml
@@ -3,7 +3,7 @@ name: codetogether-hq
 description: CodeTogether HQ provides advanced project insights for developers
 
 type: application
-version: 1.4.14
+version: 1.4.15
 appVersion: "2023.3.0"
 kubeVersion: ">= 1.18.0"
 

diff --git a/charts/hq/templates/deployment.yaml b/charts/hq/templates/deployment.yaml
@@ -19,12 +19,12 @@ spec:
       labels:
         {{- include "codetogether.selectorLabels" . | nindent 8 }}
     spec:
-      {{- if eq .Values.imageCredentials.enabled true }}
-      imagePullSecrets:
-        - name: {{ include "codetogether.fullname" . }}-pull-secret
-      {{- else if .Values.imageCredentials.pullSecret }}
+      {{- if .Values.imageCredentials.pullSecret }}
       imagePullSecrets:
         - name: {{ .Values.imageCredentials.pullSecret }}
+      {{- else if eq .Values.imageCredentials.enabled true }}
+      imagePullSecrets:
+        - name: {{ include "codetogether.fullname" . }}-pull-secret
       {{- end }}
       serviceAccountName: {{ include "codetogether.serviceAccountName" . }}
       containers:

diff --git a/charts/hq/templates/secret-pullimage.yaml b/charts/hq/templates/secret-pullimage.yaml
@@ -1,4 +1,6 @@
-{{- if eq .Values.imageCredentials.enabled true }}
+{{- if .Values.imageCredentials.pullSecret }}
+# If using already configured secret, we don't need our own
+{{- else if eq .Values.imageCredentials.enabled true }}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/hq/values.yaml b/charts/hq/values.yaml
@@ -22,7 +22,7 @@ image:
 #
 imageCredentials:
   # pullSecret: "my-customer-pull-secret"
-  # Configure credentials if using private Docker registry.
+  # Use pullSecret or configure credentials if using private Docker registry.
   enabled: true
   registry: hub.edge.codetogether.com
   username: "my-customer-username"

diff --git a/charts/live/Chart.yaml b/charts/live/Chart.yaml
@@ -3,7 +3,7 @@ name: codetogether
 description: CodeTogether Live provides pair programming and collaborative coding
 
 type: application
-version: 1.4.13
+version: 1.4.14
 appVersion: "2023.2.0"
 kubeVersion: ">= 1.18.0"
 

diff --git a/charts/live/templates/deployment.yaml b/charts/live/templates/deployment.yaml
@@ -22,7 +22,10 @@ spec:
       labels:
         {{- include "codetogether.selectorLabels" . | nindent 8 }}
     spec:
-      {{- if eq .Values.imageCredentials.enabled true }}
+      {{- if .Values.imageCredentials.pullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.imageCredentials.pullSecret }}
+      {{- else if eq .Values.imageCredentials.enabled true }}
       imagePullSecrets:
         - name: {{ include "codetogether.fullname" . }}-pull-secret
       {{- end }}

diff --git a/charts/live/templates/secret-pullimage.yaml b/charts/live/templates/secret-pullimage.yaml
@@ -1,4 +1,6 @@
-{{- if eq .Values.imageCredentials.enabled true }}
+{{- if .Values.imageCredentials.pullSecret }}
+# If using already configured secret, we don't need our own
+{{- else if eq .Values.imageCredentials.enabled true }}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/live/values.yaml b/charts/live/values.yaml
@@ -24,7 +24,8 @@ image:
 # credentials provided by your Genuitec Sales Representative.
 #
 imageCredentials:
-  # Configure credentials if using private Docker registry.
+  # pullSecret: "my-customer-pull-secret"
+  # Use pullSecret or configure credentials if using private Docker registry.
   enabled: false
   registry: hub.edge.codetogether.com
   username: "my-customer-username"