Skip to content

Commit 05e07b1

Browse files
authored
[mpi-operator, pipelines-v2] Bump versions to 0.7.1 and 0.12.7; add support for imagePullSecrets in ServiceAccounts (#1135)
1 parent fff22ac commit 05e07b1

File tree

19 files changed

+61
-2
lines changed

19 files changed

+61
-2
lines changed

stable/mpi-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: "==0.2.0"
33
description: Kubeflow MPI job operator
44
name: mpi-operator
5-
version: 0.7.0
5+
version: 0.7.1
66
home: https://www.kubeflow.org/
77
icon: https://github.com/kubeflow/marketing-materials/blob/master/logos/Raster/Kubeflow-Logo-RGB.png
88
sources:

stable/mpi-operator/templates/_helpers.tpl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,23 @@ Return the appropriate apiVersion for CRD APIs.
5252
{{- print "apiextensions.k8s.io/v1beta1" }}
5353
{{- end -}}
5454
{{- end -}}
55+
56+
{{/*
57+
Render imagePullSecrets for ServiceAccounts from global values.
58+
*/}}
59+
{{- define "mpi-operator.imagePullSecrets" -}}
60+
{{- $pullSecrets := list -}}
61+
{{- range .Values.global.imagePullSecrets -}}
62+
{{- if kindIs "map" . -}}
63+
{{- $pullSecrets = append $pullSecrets .name -}}
64+
{{- else -}}
65+
{{- $pullSecrets = append $pullSecrets . -}}
66+
{{- end -}}
67+
{{- end -}}
68+
{{- if (not (empty $pullSecrets)) -}}
69+
imagePullSecrets:
70+
{{- range $pullSecrets | uniq }}
71+
- name: {{ . }}
72+
{{- end -}}
73+
{{- end -}}
74+
{{- end -}}

stable/mpi-operator/templates/mpi-operator-serviceaccount.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ metadata:
99
chart: {{ template "mpi-operator.chart" . }}
1010
release: {{ .Release.Name }}
1111
heritage: {{ .Release.Service }}
12+
{{- include "mpi-operator.imagePullSecrets" . | nindent 0 }}
1213
{{- end }}

stable/mpi-operator/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ rbac:
1616
deployment:
1717
create: true
1818

19+
global:
20+
imagePullSecrets: []
21+
1922
image:
2023
deployment:
2124
replicas: 1

stable/pipelines-v2/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
appVersion: ">=2.5.0"
3-
version: 0.12.6
3+
version: 0.12.7
44
name: pipelines-v2
55
description: Kubeflow pipelines framework for machine learning
66
home: https://www.kubeflow.org/

stable/pipelines-v2/templates/_helpers.tpl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,23 @@ Define secret key name for the minio secret
6464
{{- "mysql-kf-secret" -}}
6565
{{- end -}}
6666
{{- end -}}
67+
68+
{{/*
69+
Render imagePullSecrets for ServiceAccounts from global values.
70+
*/}}
71+
{{- define "pipelines.imagePullSecrets" -}}
72+
{{- $pullSecrets := list -}}
73+
{{- range .Values.global.imagePullSecrets -}}
74+
{{- if kindIs "map" . -}}
75+
{{- $pullSecrets = append $pullSecrets .name -}}
76+
{{- else -}}
77+
{{- $pullSecrets = append $pullSecrets . -}}
78+
{{- end -}}
79+
{{- end -}}
80+
{{- if (not (empty $pullSecrets)) -}}
81+
imagePullSecrets:
82+
{{- range $pullSecrets | uniq }}
83+
- name: {{ . }}
84+
{{- end -}}
85+
{{- end -}}
86+
{{- end -}}

stable/pipelines-v2/templates/argo/workflow-controller-serviceaccount.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ metadata:
77
labels:
88
component: argo
99
{{ include "pipelines.commonLabels" . | indent 4 }}
10+
{{- include "pipelines.imagePullSecrets" . | nindent 0 }}
1011
{{- end }}

stable/pipelines-v2/templates/metadata/grpc-serviceaccount.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: metadata-grpc-server
6+
{{- include "pipelines.imagePullSecrets" . | nindent 0 }}
67
{{- end }}

stable/pipelines-v2/templates/metadata/writer-serviceaccount.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ metadata:
77
labels:
88
component: metadata-writer
99
{{ include "pipelines.commonLabels" . | indent 4 }}
10+
{{- include "pipelines.imagePullSecrets" . | nindent 0 }}
1011
{{- end }}

stable/pipelines-v2/templates/ml-pipeline/apiserver/serviceaccount.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ metadata:
77
labels:
88
component: ml-pipeline
99
{{ include "pipelines.commonLabels" . | indent 4 }}
10+
{{- include "pipelines.imagePullSecrets" . | nindent 0 }}
1011
{{- end }}

0 commit comments

Comments
 (0)