diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/templates/_helpers.tpl b/projects/control-service/projects/helm_charts/pipelines-control-service/templates/_helpers.tpl index b7f4aa338c..6a708df634 100644 --- a/projects/control-service/projects/helm_charts/pipelines-control-service/templates/_helpers.tpl +++ b/projects/control-service/projects/helm_charts/pipelines-control-service/templates/_helpers.tpl @@ -247,3 +247,7 @@ Image Pull Secret in json format {{- define "builderPullSecretJson" }} {{ include "buildImagePullSecretJson" (list .Values.deploymentBuilderImage.registry .Values.deploymentBuilderImage.username .Values.deploymentBuilderImage.password) }} {{- end }} + +{{- define "basePullSecretJson" }} + {{ include "buildImagePullSecretJson" (list .Values.deploymentDataJobBaseImage.registry .Values.deploymentDataJobBaseImage.username .Values.deploymentDataJobBaseImage.password) }} +{{- end }} diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/templates/secret_pull_base_img.yaml b/projects/control-service/projects/helm_charts/pipelines-control-service/templates/secret_pull_base_img.yaml new file mode 100644 index 0000000000..7a33366c77 --- /dev/null +++ b/projects/control-service/projects/helm_charts/pipelines-control-service/templates/secret_pull_base_img.yaml @@ -0,0 +1,13 @@ +{{- if .Values.deploymentDataJobBaseImage.password }} +apiVersion: v1 +kind: Secret +metadata: + name: builder-secrets + namespace: {{ .Values.controlK8sNamespace }} + labels: {{- include "pipelines-control-service.labels" . | nindent 4 }} +type: kubernetes.io/dockerconfigjson +data: +{{/* Within this section any set of properties can be set and then used in a job builder image +at the moment the only one set is extra_auth: Within this property docker config should be included to connect to the registry used to pull the image from. */}} + extra_auth: {{- printf ", \"%s\": {\"auth\": \"%s\"}" .Values.deploymentDataJobBaseImage.registry (printf "%s:%s" .Values.deploymentDataJobBaseImage.username .Values.deploymentDataJobBaseImage.password | b64enc) | b64enc }} +{{- end }} diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml index 0b44fbe05a..d5f3276a89 100644 --- a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml +++ b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml @@ -236,6 +236,8 @@ deploymentDataJobBaseImage: registry: registry.hub.docker.com/versatiledatakit repository: data-job-base-python-3.7 tag: "latest" + username: + password: ## ini formatted options that provides default and per-job VDK options. ## Allows to provide VDK configuration via environment variables.