Skip to content

Commit bc7611f

Browse files
authored
Merge pull request #8730 from zalando-incubator/revert-kube-controller-manager-fix
Use default kube-controller-manager image
2 parents 62cc974 + a87a5f5 commit bc7611f

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

cluster/node-pools/master-default/userdata.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -599,11 +599,7 @@ write_files:
599599
effect: NoSchedule
600600
containers:
601601
- name: kube-controller-manager
602-
{{- if eq .Cluster.ConfigItems.kubernetes_controller_manager_image "zalando" }}
603-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-controller-manager-internal:v1.31.3-master-133
604-
{{- else }}
605-
image: nonexistent.zalan.do/teapot/kube-controller-manager:fixed
606-
{{- end }}
602+
image: nonexistent.zalan.do/teapot/{{if eq .Cluster.ConfigItems.kubernetes_controller_manager_image "zalando" }}kube-controller-manager-internal{{else}}kube-controller-manager{{end}}:fixed
607603
args:
608604
- --kubeconfig=/etc/kubernetes/controller-manager-kubeconfig
609605
- --leader-elect=true

0 commit comments

Comments
 (0)