fix(base-cluster/kube-janitor): enable artifacthub-values and correct…

…ly prefix docker.io registry (#1048)
teutonet · Jul 24, 2024 · 17b9baf · 17b9baf
1 parent 4ef2389
commit 17b9baf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/trusted_registries.yaml b/.github/trusted_registries.yaml
@@ -10,6 +10,8 @@ registries:
       curl: ALL_TAGS
     fluxcd: ALL_IMAGES
     grafana: ALL_IMAGES
+    hjacobs:
+      kube-janitor: ALL_TAGS
     stellio: ALL_IMAGES
     velero: ALL_IMAGES
     vladgh:

diff --git a/charts/base-cluster/ci/artifacthub-values.yaml b/charts/base-cluster/ci/artifacthub-values.yaml
@@ -27,3 +27,5 @@ monitoring:
         pagerduty:
           enabled: true
           integrationKey: INTEGRATION_KEY
+kube-janitor:
+  enabled: true
diff --git a/charts/base-cluster/templates/global/kube-janitor.yaml b/charts/base-cluster/templates/global/kube-janitor.yaml
@@ -14,16 +14,11 @@ spec:
     mode: enabled
   values:
     priorityClassName: cluster-components
-    {{- $image := dict -}}
-      {{- if .Values.global.imageRegistry -}}
-        {{- $image = set $image "repository" (printf "%s/hjacobs/kube-janitor" $.Values.global.imageRegistry) -}}
-      {{- end }}
-      {{- with dig "kube-janitor" "charts" "kube-janitor" "tag" "" .Values.global.helmRepositories -}}
-        {{- $image = set $image "tag" . -}}
-      {{- end }}
-    {{- with $image }}
-    image: {{- toYaml $image | nindent 6 }}
+    {{- $image := dict "repository" (printf "%s/hjacobs/kube-janitor" ($.Values.global.imageRegistry | default (include "base-cluster.defaultRegistry" (dict)))) -}}
+    {{- with dig "kube-janitor" "charts" "kube-janitor" "tag" "" .Values.global.helmRepositories -}}
+      {{- $image = set $image "tag" . -}}
     {{- end }}
+    image: {{- toYaml $image | nindent 6 }}
     resources:
       limits:
         memory: 1Gi