feat: imagePullSecrets for servers and controllers (#361)

This commit is contained in:
Tim Hobbs 2020-08-30 19:10:09 +02:00 committed by GitHub
parent e1e2dd9631
commit ffc9220f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 50 additions and 4 deletions

1
.gitignore vendored
View file

@ -3,3 +3,4 @@ output
.DS_Store .DS_Store
.idea .idea
**/*.tgz **/*.tgz
**/charts/*/charts

View file

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart for Argo-CI description: A Helm chart for Argo-CI
name: 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 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
appVersion: v1.0.0-alpha2 appVersion: v1.0.0-alpha2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm

View file

@ -33,3 +33,7 @@ spec:
ports: ports:
- containerPort: 8001 - containerPort: 8001
- containerPort: 8002 - containerPort: 8002
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -2,6 +2,9 @@ imageNamespace: argoproj
ciImage: argoci ciImage: argoci
imageTag: v1.0.0-alpha2 imageTag: v1.0.0-alpha2
imagePullPolicy: Always imagePullPolicy: Always
# Secrets with credentials to pull images from a private registry
imagePullSecrets: []
# - name: argo-pull-secret
workflowNamespace: default workflowNamespace: default
argo: argo:

View file

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart to install Argo-Events in k8s Cluster description: A Helm chart to install Argo-Events in k8s Cluster
name: argo-events name: argo-events
version: 0.17.0 version: 0.17.1
keywords: keywords:
- argo-events - argo-events
- sensor-controller - sensor-controller

View file

@ -37,3 +37,7 @@ spec:
value: {{ .Values.eventbusController.natsStreamingImage }} value: {{ .Values.eventbusController.natsStreamingImage }}
- name: NATS_METRICS_EXPORTER_IMAGE - name: NATS_METRICS_EXPORTER_IMAGE
value: {{ .Values.eventbusController.natsMetricsExporterImage }} value: {{ .Values.eventbusController.natsMetricsExporterImage }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventbus.argoproj.io name: eventbus.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
names: names:

View file

@ -35,3 +35,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: EVENTSOURCE_IMAGE - name: EVENTSOURCE_IMAGE
value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}" value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: eventsources.argoproj.io name: eventsources.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
scope: Namespaced scope: Namespaced

View file

@ -35,3 +35,7 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
- name: SENSOR_IMAGE - name: SENSOR_IMAGE
value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}" value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}

View file

@ -4,6 +4,9 @@ apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
name: sensors.argoproj.io name: sensors.argoproj.io
annotations:
helm.sh/hook: crd-install
helm.sh/hook-delete-policy: before-hook-creation
spec: spec:
group: argoproj.io group: argoproj.io
names: names:

View file

@ -4,6 +4,10 @@ registry: argoproj
# The image pull policy # The image pull policy
imagePullPolicy: Always 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. # If set to false, skip installing the CRDs. Requires user to have them installed prior to helm chart installation.
installCRD: true installCRD: true

View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "0.8.3" appVersion: "0.8.3"
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 0.3.5 version: 0.3.6
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

View file

@ -40,4 +40,6 @@ serviceAnnotations: {}
## ##
podLabels: {} podLabels: {}
# Secrets with credentials to pull images from a private registry
imagePullSecrets: [] imagePullSecrets: []
# - name: argo-pull-secret

View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: v2.8.0 appVersion: v2.8.0
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
name: argo name: argo
version: 0.9.9 version: 0.9.10
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

View file

@ -67,6 +67,10 @@ spec:
volumeMounts: volumeMounts:
{{- toYaml . | nindent 12}} {{- toYaml . | nindent 12}}
{{- end }} {{- end }}
{{- with .Values.images.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.server.volumes }} {{- with .Values.server.volumes }}
volumes: volumes:
{{- toYaml . | nindent 8}} {{- toYaml . | nindent 8}}

View file

@ -63,6 +63,10 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
{{- end }} {{- end }}
{{- with .Values.images.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.controller.nodeSelector }} {{- with .Values.controller.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -4,6 +4,9 @@ images:
server: argocli server: argocli
executor: argoexec executor: argoexec
pullPolicy: Always pullPolicy: Always
# Secrets with credentials to pull images from a private registry
pullSecrets: []
# - name: argo-pull-secret
tag: v2.7.6 tag: v2.7.6
crdVersion: v1alpha1 crdVersion: v1alpha1