From 5012e817dd7926bef46a653e6a030b00849aefda Mon Sep 17 00:00:00 2001 From: Michael Zuberbuehler Date: Mon, 3 Aug 2026 16:56:07 +0200 Subject: [PATCH 1/3] BUG-451 Allow setting imagePullSecrets for Deployment --- deploy/charts/version-checker/temp.yaml | 165 ++++++++++++++++++ .../version-checker/templates/deployment.yaml | 4 + deploy/charts/version-checker/values.yaml | 6 +- 3 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 deploy/charts/version-checker/temp.yaml diff --git a/deploy/charts/version-checker/temp.yaml b/deploy/charts/version-checker/temp.yaml new file mode 100644 index 00000000..3380106d --- /dev/null +++ b/deploy/charts/version-checker/temp.yaml @@ -0,0 +1,165 @@ +--- +# Source: version-checker/templates/serviceaccount.yaml +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm + name: version-checker + +--- +# Source: version-checker/templates/clusterrole.yaml +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + labels: + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm + name: version-checker +rules: +- apiGroups: + - "" + resources: + - "pods" + verbs: + - "get" + - "list" + - "watch" + +--- +# Source: version-checker/templates/clusterrolebinding.yaml +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + labels: + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm + name: version-checker +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: version-checker +subjects: +- kind: ServiceAccount + name: version-checker + namespace: srf-telegraf + +--- +# Source: version-checker/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: version-checker + labels: + app: version-checker + + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm +spec: + ports: + - port: 8080 + targetPort: 8080 + protocol: TCP + name: web + selector: + app.kubernetes.io/name: version-checker + app.kubernetes.io/instance: release-name + +--- +# Source: version-checker/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: version-checker + labels: + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: version-checker + app.kubernetes.io/instance: release-name + template: + metadata: + labels: + app.kubernetes.io/name: version-checker + helm.sh/chart: version-checker-v0.11.0 + app.kubernetes.io/instance: release-name + app.kubernetes.io/version: "v0.11.0" + app.kubernetes.io/managed-by: Helm + annotations: + prometheus.io/path: "/metrics" + prometheus.io/scrape: "true" + prometheus.io/port: "8080" + enable.version-checker.io/version-checker: "true" + spec: + serviceAccountName: version-checker + containers: + - name: version-checker + image: "quay.io/jetstack/version-checker:v0.11.0" + imagePullPolicy: IfNotPresent + ports: + - name: metrics + containerPort: 8080 + command: ["version-checker"] + args: + - "--image-cache-timeout=30m" + - "--log-level=info" + - "--metrics-serving-address=0.0.0.0:8080" + - "--test-all-containers=true" + resources: + {} + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 65534 + seccompProfile: + type: RuntimeDefault + livenessProbe: + httpGet: + path: /readyz + port: 8080 + initialDelaySeconds: 3 + periodSeconds: 3 + readinessProbe: + httpGet: + path: /readyz + port: 8080 + initialDelaySeconds: 3 + periodSeconds: 3 + env: + + + + + + + + + + + # Extra Envs + imagePullSecrets: + - mk8s-pullsecret + volumes: diff --git a/deploy/charts/version-checker/templates/deployment.yaml b/deploy/charts/version-checker/templates/deployment.yaml index f483a0f8..def44e59 100644 --- a/deploy/charts/version-checker/templates/deployment.yaml +++ b/deploy/charts/version-checker/templates/deployment.yaml @@ -80,6 +80,10 @@ spec: volumeMounts: {{- toYaml . | nindent 10 }} {{- end }} + {{- if .Values.imagePullSecrets }} + imagePullSecrets: + {{ toYaml .Values.imagePullSecrets | indent 2 }} + {{- end }} {{- with .Values.podSecurityContext }} securityContext: {{- toYaml . | nindent 8 }} diff --git a/deploy/charts/version-checker/values.yaml b/deploy/charts/version-checker/values.yaml index 46ce5364..09d219bd 100644 --- a/deploy/charts/version-checker/values.yaml +++ b/deploy/charts/version-checker/values.yaml @@ -8,6 +8,9 @@ nameOverride: "" # -- Replica Count for version-checker replicaCount: 1 +# -- Pull secrects - names of existing secrets +imagePullSecrets: [] + # -- Additional Labels to apply to Service and Deployment/Pod Objects additionalLabels: {} # -- Additional Annotations to apply to Service and Deployment/Pod Objects @@ -20,8 +23,7 @@ image: tag: "" # -- Set the Image Pull Policy pullPolicy: IfNotPresent - # -- Pull secrects - name of existing secret - imagePullSecret: + # -- Configure tolerations tolerations: [] From 2735ba113551714cf520f5545665789a215af088 Mon Sep 17 00:00:00 2001 From: Michael Zuberbuehler Date: Mon, 3 Aug 2026 16:57:09 +0200 Subject: [PATCH 2/3] Remove temporary file --- deploy/charts/version-checker/temp.yaml | 165 ------------------------ 1 file changed, 165 deletions(-) delete mode 100644 deploy/charts/version-checker/temp.yaml diff --git a/deploy/charts/version-checker/temp.yaml b/deploy/charts/version-checker/temp.yaml deleted file mode 100644 index 3380106d..00000000 --- a/deploy/charts/version-checker/temp.yaml +++ /dev/null @@ -1,165 +0,0 @@ ---- -# Source: version-checker/templates/serviceaccount.yaml -apiVersion: v1 -kind: ServiceAccount -metadata: - labels: - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm - name: version-checker - ---- -# Source: version-checker/templates/clusterrole.yaml -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - labels: - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm - name: version-checker -rules: -- apiGroups: - - "" - resources: - - "pods" - verbs: - - "get" - - "list" - - "watch" - ---- -# Source: version-checker/templates/clusterrolebinding.yaml -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - labels: - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm - name: version-checker -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: version-checker -subjects: -- kind: ServiceAccount - name: version-checker - namespace: srf-telegraf - ---- -# Source: version-checker/templates/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: version-checker - labels: - app: version-checker - - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm -spec: - ports: - - port: 8080 - targetPort: 8080 - protocol: TCP - name: web - selector: - app.kubernetes.io/name: version-checker - app.kubernetes.io/instance: release-name - ---- -# Source: version-checker/templates/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: version-checker - labels: - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: version-checker - app.kubernetes.io/instance: release-name - template: - metadata: - labels: - app.kubernetes.io/name: version-checker - helm.sh/chart: version-checker-v0.11.0 - app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v0.11.0" - app.kubernetes.io/managed-by: Helm - annotations: - prometheus.io/path: "/metrics" - prometheus.io/scrape: "true" - prometheus.io/port: "8080" - enable.version-checker.io/version-checker: "true" - spec: - serviceAccountName: version-checker - containers: - - name: version-checker - image: "quay.io/jetstack/version-checker:v0.11.0" - imagePullPolicy: IfNotPresent - ports: - - name: metrics - containerPort: 8080 - command: ["version-checker"] - args: - - "--image-cache-timeout=30m" - - "--log-level=info" - - "--metrics-serving-address=0.0.0.0:8080" - - "--test-all-containers=true" - resources: - {} - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - readOnlyRootFilesystem: true - runAsNonRoot: true - runAsUser: 65534 - seccompProfile: - type: RuntimeDefault - livenessProbe: - httpGet: - path: /readyz - port: 8080 - initialDelaySeconds: 3 - periodSeconds: 3 - readinessProbe: - httpGet: - path: /readyz - port: 8080 - initialDelaySeconds: 3 - periodSeconds: 3 - env: - - - - - - - - - - - # Extra Envs - imagePullSecrets: - - mk8s-pullsecret - volumes: From 0682c65d37ce07abf13538623684320ca4d4183f Mon Sep 17 00:00:00 2001 From: Michael Zuberbuehler Date: Mon, 3 Aug 2026 16:57:43 +0200 Subject: [PATCH 3/3] Remove whitespace --- deploy/charts/version-checker/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/charts/version-checker/values.yaml b/deploy/charts/version-checker/values.yaml index 09d219bd..5911c3d9 100644 --- a/deploy/charts/version-checker/values.yaml +++ b/deploy/charts/version-checker/values.yaml @@ -23,7 +23,6 @@ image: tag: "" # -- Set the Image Pull Policy pullPolicy: IfNotPresent - # -- Configure tolerations tolerations: []