chore: use ecr registry and hardcode service account (#1906)

* chore: use ecr registry and hardcode service account

* chore: update image registry in helm test

* chore: add ci debug step

* chore: update image registry in helm test

* chore: use image.globalRegsitry for postgres

* chore: update registry defaults

* chore: fix helm test

* chore: address review comments

* chore: remove debug action

* chore: do not push latest on ecr

Author: yashmehrotra

.github/workflows/helm-test.yml

@@ -26,13 +26,13 @@ jobs:
           context: .
           file: ./build/full/Dockerfile
           push: true
-          tags: localhost:5000/canary-checker:latest
+          tags: localhost:5000/flanksource/canary-checker:latest
           cache-from: type=registry,ref=docker.io/flanksource/canary-checker
 
       - name: Update canary-checker image in helm chart
         uses: mikefarah/yq@master
         with:
-          cmd: yq -i e '.image.repository = "kind-registry:5000/canary-checker"' chart/values.yaml
+          cmd: yq -i e '.global.imageRegistry = "kind-registry:5000"' chart/values.yaml
 
       - name: Setup Helm
         uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5

chart/templates/_helpers.tpl

@@ -71,5 +71,9 @@ control-plane: canary-checker
 Image Name
 */}}
 {{- define "canary-checker.imageString" -}}
-{{ .Values.image.repository }}{{- if eq (lower .Values.image.type) "full" }}-full{{- end }}:{{ .Values.image.tag }} 
+{{ tpl .Values.global.imageRegistry . }}/{{ tpl .Values.image.name . }}{{- if eq (lower .Values.image.type) "full" }}-full{{- end }}:{{ .Values.image.tag }}
+{{- end }}
+
+{{- define "canary-checker.postgres.imageString" -}}
+{{ tpl .Values.global.imageRegistry . }}/supabase/postgres:14.1.0.89
 {{- end }}

chart/templates/clusterrolebinding.yaml

@@ -8,5 +8,5 @@ roleRef:
   name: {{ include "canary-checker.name" . }}-role
 subjects:
   - kind: ServiceAccount
-    name: {{ include "canary-checker.fullname" . }}-sa
+    name: {{ .Values.serviceAccount.name }}
     namespace: {{ .Release.Namespace }}

chart/templates/deployment.yaml

@@ -37,7 +37,7 @@ spec:
       labels:
         {{- include "canary-checker.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{ include "canary-checker.fullname" . }}-sa
+      serviceAccountName: {{ .Values.serviceAccount.name }}
       volumes:
         {{- if eq .Values.dockerSocket true }}
         - name: dockersock

chart/templates/postgres-statefulset.yaml

@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: postgres:14
+        image: {{ include "canary-checker.postgres.imageString" . }}
         volumeMounts:
           - name: postgresql
             mountPath: /data

chart/templates/serviceaccount.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "canary-checker.fullname" . }}-sa
+  name: {{ .Values.serviceAccount.name }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

chart/values.yaml

@@ -3,6 +3,8 @@
 # Declare variables to be passed into your templates.
 
 global:
+  imageRegistry: docker.io
+  imagePrefix: flanksource
   db:
     connectionPooler:
       enabled: false
@@ -13,7 +15,7 @@ global:
 replicas: 1
 
 image:
-  repository: docker.io/flanksource/canary-checker
+  name: '{{.Values.global.imagePrefix}}/canary-checker'
   ## Options: minimal | full
   ## full image is larger and requires more permissions to run, but is required to execute 3rd party checks (jmeter, restic, k6 etc)
   type: minimal
@@ -148,6 +150,7 @@ resources:
     memory: 2Gi
 
 serviceAccount:
+  name: canary-checker-sa
   # Configures extra annotations on the service account
   # annotations:
   #   some: annotation