Skip to content

Commit 0f2c3cb

Browse files
committed
added upgrade docker-registry
1 parent e1d4fce commit 0f2c3cb

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

venonactl/pkg/plugins/venona.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,13 @@ func updateValuesBasedOnPreviousDeployment(ns string, kubeClientset *kubernetes.
233233
v["Tolerations"] = tolerationsToSring(runnerDeployment.Spec.Template.Spec.Tolerations)
234234
}
235235

236+
for _, envVar := range runnerDeployment.Spec.Template.Spec.Containers[0].Env {
237+
if envVar.Name == "DOCKER_REGISTRY" {
238+
v["DockerRegistry"] = envVar.Value
239+
break
240+
}
241+
}
242+
236243
v["AdditionalEnvVars"] = getEnvVarsFromDeployment(runnerDeployment.Spec.Template.Spec.Containers)
237244
return v, nil
238245

venonactl/pkg/templates/kubernetes/deployment.dind-volume-provisioner.vp.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ spec:
4747
env:
4848
- name: PROVISIONER_NAME
4949
value: codefresh.io/dind-volume-provisioner-{{ .AppName }}-{{ .Namespace }}
50+
{{- if ne .DockerRegistry "" }}
51+
- name: DOCKER_REGISTRY
52+
value: {{ .DockerRegistry }}
53+
{{- end }}
5054
{{- if .Storage.AwsAccessKeyId }}
5155
- name: AWS_ACCESS_KEY_ID
5256
valueFrom:

venonactl/pkg/templates/kubernetes/deployment.venona.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ spec:
6363
value: {{ .AgentId }}
6464
- name: VENONA_CONFIG_DIR
6565
value: "/etc/secrets"
66+
{{- if ne .DockerRegistry "" }}
67+
- name: DOCKER_REGISTRY
68+
value: {{ .DockerRegistry }}
69+
{{- end }}
6670
image: {{ if ne .DockerRegistry ""}} {{- .DockerRegistry }}/{{ .Image.Name }}:{{ .Image.Tag }} {{- else }} {{- .Image.Name }}:{{ .Image.Tag }} {{- end}}
6771
volumeMounts:
6872
- name: runnerconf

venonactl/pkg/templates/kubernetes/templates.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)