From ffc9220f04e27a332d7db6df938d297978e008d3 Mon Sep 17 00:00:00 2001 From: Tim Hobbs Date: Sun, 30 Aug 2020 19:10:09 +0200 Subject: [PATCH] feat: imagePullSecrets for servers and controllers (#361) --- .gitignore | 1 + charts/argo-ci/Chart.yaml | 2 +- charts/argo-ci/templates/ci-deployment.yaml | 4 ++++ charts/argo-ci/values.yaml | 3 +++ charts/argo-events/Chart.yaml | 2 +- .../argo-events/templates/eventbus-controller-deployment.yaml | 4 ++++ charts/argo-events/templates/eventbus-crd.yaml | 3 +++ .../templates/eventsource-controller-deployment.yaml | 4 ++++ charts/argo-events/templates/eventsource-crd.yaml | 3 +++ .../argo-events/templates/sensor-controller-deployment.yaml | 4 ++++ charts/argo-events/templates/sensor-crd.yaml | 3 +++ charts/argo-events/values.yaml | 4 ++++ charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/values.yaml | 2 ++ charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-deployment.yaml | 4 ++++ charts/argo/templates/workflow-controller-deployment.yaml | 4 ++++ charts/argo/values.yaml | 3 +++ 18 files changed, 50 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2529e3b1..2786867c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ output .DS_Store .idea **/*.tgz +**/charts/*/charts diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml index 337de899..b658915d 100644 --- a/charts/argo-ci/Chart.yaml +++ b/charts/argo-ci/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Argo-CI name: argo-ci -version: 0.1.6 +version: 0.1.7 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png appVersion: v1.0.0-alpha2 home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-ci/templates/ci-deployment.yaml b/charts/argo-ci/templates/ci-deployment.yaml index 1995f29c..bf2e4121 100644 --- a/charts/argo-ci/templates/ci-deployment.yaml +++ b/charts/argo-ci/templates/ci-deployment.yaml @@ -33,3 +33,7 @@ spec: ports: - containerPort: 8001 - containerPort: 8002 + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml index cccff91b..86dadf98 100644 --- a/charts/argo-ci/values.yaml +++ b/charts/argo-ci/values.yaml @@ -2,6 +2,9 @@ imageNamespace: argoproj ciImage: argoci imageTag: v1.0.0-alpha2 imagePullPolicy: Always +# Secrets with credentials to pull images from a private registry +imagePullSecrets: [] +# - name: argo-pull-secret workflowNamespace: default argo: diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index f63ec1a8..9da7eea6 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 0.17.0 +version: 0.17.1 keywords: - argo-events - sensor-controller diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml index 8d0ec2b3..dc698b1b 100644 --- a/charts/argo-events/templates/eventbus-controller-deployment.yaml +++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml @@ -37,3 +37,7 @@ spec: value: {{ .Values.eventbusController.natsStreamingImage }} - name: NATS_METRICS_EXPORTER_IMAGE value: {{ .Values.eventbusController.natsMetricsExporterImage }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml index dfc7b2cb..175e2e60 100644 --- a/charts/argo-events/templates/eventbus-crd.yaml +++ b/charts/argo-events/templates/eventbus-crd.yaml @@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: eventbus.argoproj.io + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: argoproj.io names: diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml index 3b050eda..99947ade 100644 --- a/charts/argo-events/templates/eventsource-controller-deployment.yaml +++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml @@ -35,3 +35,7 @@ spec: fieldPath: metadata.namespace - name: EVENTSOURCE_IMAGE value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}" + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml index c174ae56..e791608b 100644 --- a/charts/argo-events/templates/eventsource-crd.yaml +++ b/charts/argo-events/templates/eventsource-crd.yaml @@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: eventsources.argoproj.io + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: argoproj.io scope: Namespaced diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml index 24986d82..425fd66b 100644 --- a/charts/argo-events/templates/sensor-controller-deployment.yaml +++ b/charts/argo-events/templates/sensor-controller-deployment.yaml @@ -35,3 +35,7 @@ spec: fieldPath: metadata.namespace - name: SENSOR_IMAGE value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}" + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml index 12e19e0f..cf3793c4 100644 --- a/charts/argo-events/templates/sensor-crd.yaml +++ b/charts/argo-events/templates/sensor-crd.yaml @@ -4,6 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: sensors.argoproj.io + annotations: + helm.sh/hook: crd-install + helm.sh/hook-delete-policy: before-hook-creation spec: group: argoproj.io names: diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 59fa2209..d963d9db 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -4,6 +4,10 @@ registry: argoproj # The image pull policy imagePullPolicy: Always +# Secrets with credentials to pull images from a private registry +imagePullSecrets: [] +# - name: argo-pull-secret + # If set to false, skip installing the CRDs. Requires user to have them installed prior to helm chart installation. installCRD: true diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index c12e756b..418dd589 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.8.3" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.3.5 +version: 0.3.6 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index fbb2f68b..9e2011d2 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -40,4 +40,6 @@ serviceAnnotations: {} ## podLabels: {} +# Secrets with credentials to pull images from a private registry imagePullSecrets: [] +# - name: argo-pull-secret diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 112e2ae0..75980b73 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v2.8.0 description: A Helm chart for Argo Workflows name: argo -version: 0.9.9 +version: 0.9.10 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml index 52acbc79..2593d07f 100644 --- a/charts/argo/templates/server-deployment.yaml +++ b/charts/argo/templates/server-deployment.yaml @@ -67,6 +67,10 @@ spec: volumeMounts: {{- toYaml . | nindent 12}} {{- end }} + {{- with .Values.images.pullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.server.volumes }} volumes: {{- toYaml . | nindent 8}} diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml index 852bad52..752183ea 100644 --- a/charts/argo/templates/workflow-controller-deployment.yaml +++ b/charts/argo/templates/workflow-controller-deployment.yaml @@ -63,6 +63,10 @@ spec: ports: - containerPort: 8080 {{- end }} + {{- with .Values.images.pullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.controller.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 0dc5dd47..9662ea50 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -4,6 +4,9 @@ images: server: argocli executor: argoexec pullPolicy: Always + # Secrets with credentials to pull images from a private registry + pullSecrets: [] + # - name: argo-pull-secret tag: v2.7.6 crdVersion: v1alpha1