revoke private registry enhancements (#2121)

* private private registry enhancements * revoke values.yaml
astronomer · Feb 8, 2024 · c0bcf17 · c0bcf17
1 parent a7c7209
commit c0bcf17
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 29 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -47,21 +47,3 @@ nginx.ingress.kubernetes.io/auth-url: https://houston.{{ .Values.global.baseDoma
 {{ .Values.global.loggingSidecar.image }}
 {{- end }}
 {{- end }}
-
-{{ define "certCopier.image" -}}
-{{- if .Values.global.privateRegistry.enabled -}}
-{{ .Values.global.privateRegistry.repository }}/ap-base:{{ .Values.global.privateCaCertsAddToHost.certCopier.tag }}
-{{- else -}}
-{{ .Values.global.privateCaCertsAddToHost.certCopier.repository }}:{{ .Values.global.privateCaCertsAddToHost.certCopier.tag }}
-{{- end }}
-{{- end }}
-
-{{/*
-Return the proper Docker Image Registry Secret Names
-*/}}
-{{- define "certCopier.imagePullSecrets" -}}
-{{- if and .Values.global.privateRegistry.enabled .Values.global.privateRegistry.secretName }}
-imagePullSecrets:
-  - name: {{ .Values.global.privateRegistry.secretName }}
-{{- end -}}
-{{- end -}}
diff --git a/templates/trust-private-ca-on-all-nodes/containerd-daemonset.yaml b/templates/trust-private-ca-on-all-nodes/containerd-daemonset.yaml
@@ -40,16 +40,15 @@ spec:
       affinity:
 {{ toYaml .Values.global.privateCaCertsAddToHost.containerdnodeAffinitys  | indent 8 }}
 {{ end }}
-{{- include "certCopier.imagePullSecrets" . | indent 6 }}
       containers:
       - name: cert-copy-and-toml-update
-        image: {{ include "certCopier.image" . }}
+        image: {{ .Values.global.privateCaCertsAddToHost.certCopier.repository }}:{{ .Values.global.privateCaCertsAddToHost.certCopier.tag }}
         command:
           - "sh"
           - "-c"
         args:
           - sh /cert-copy-and-toml-update.sh
-        imagePullPolicy: {{ .Values.global.privateCaCertsAddToHost.certCopier.pullPolicy }}
+        imagePullPolicy: IfNotPresent
         securityContext:
           runAsUser: 0
           privileged: true

diff --git a/templates/trust-private-ca-on-all-nodes/daemonset.yaml b/templates/trust-private-ca-on-all-nodes/daemonset.yaml
@@ -35,16 +35,15 @@ spec:
         version: {{ .Chart.Version }}
     spec:
       serviceAccountName: {{ .Release.Name }}-private-ca
-{{- include "certCopier.imagePullSecrets" . | indent 6 }}
       containers:
       - name: cert-copy
-        image: {{ include "certCopier.image" . }}
+        image: {{ .Values.global.privateCaCertsAddToHost.certCopier.repository }}:{{ .Values.global.privateCaCertsAddToHost.certCopier.tag }}
         command:
           - "sh"
           - "-c"
         args:
           - "while true; do date; cp -v /private-ca-certs/* /host-trust-store/; sleep 10; done"
-        imagePullPolicy: {{ .Values.global.privateCaCertsAddToHost.certCopier.pullPolicy }}
+        imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: hostcerts
           mountPath: /host-trust-store

diff --git a/tests/enable_all_features.yaml b/tests/enable_all_features.yaml
@@ -15,9 +15,6 @@ global:
   pspEnabled: true
   taskUsageMetricsEnabled: True
   veleroEnabled: true
-  privateCaCertsAddToHost:
-    enabled: true
-    addToContainerd: true
 prometheus-node-exporter:
   rbac:
     create: true

diff --git a/values.yaml b/values.yaml
@@ -25,8 +25,8 @@ global:
     containerdConfigToml: ~
     containerdnodeAffinitys: []
     certCopier:
-      repository: quay.io/astronomer/ap-base
-      tag: 3.18.5
+      repository: alpine
+      tag: 3.18
       pullPolicy: IfNotPresent
   # Global flag to enable to user to enable/disable Astronomer platform
   # level Network Policy