Merge pull request #56 from tithely/docker-registry

Updates to Docker Registry support
tithely · Jul 31, 2024 · e33038d · e33038d
2 parents e099877 + 009709e
commit e33038d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/charts/generic-service/templates/frontend-deployment.yaml b/charts/generic-service/templates/frontend-deployment.yaml
@@ -35,6 +35,10 @@ spec:
         tags.datadoghq.com/service: {{ $.Values.project | quote }}
         tags.datadoghq.com/version: {{ $.Values.version | quote }}
     spec:
+      {{- if and $value.imagepolicy.repositoryType (eq $value.imagepolicy.repositoryType "docker") }}
+      imagePullSecrets:
+        - name: docker-registry-credentials
+      {{- end }}
       containers:
         - name: {{ $.Chart.Name }}
           image: "{{ $value.image }}"

diff --git a/charts/generic-service/templates/imagepolicy.yaml b/charts/generic-service/templates/imagepolicy.yaml
@@ -23,7 +23,7 @@ metadata:
   name: {{ $.Release.Namespace }}-{{ $value.name }}
   namespace: flux-system
 spec:
-  {{- if not (or (empty $value.imagepolicy.repositoryType) (eq $value.imagepolicy.repositoryType "ecr")) }}
+  {{- if (or (empty $value.imagepolicy.repositoryType) (eq $value.imagepolicy.repositoryType "ecr")) }}
   filterTags:
     extract: $ts
     pattern: {{ $value.imagepolicy.pattern }}
@@ -40,4 +40,3 @@ spec:
       order: asc
   {{- end }}
   {{- end }}
-