Use Docker images for individual components instead of hyperkube

Signed-off-by: Alexey Ermakov <alexey.ermakov@zalando.de>
zalando-incubator · Feb 21, 2019 · 1369837 · 1369837
1 parent ebc7652
commit 1369837
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/cluster/manifests/kube-proxy/daemonset.yaml b/cluster/manifests/kube-proxy/daemonset.yaml
@@ -31,10 +31,8 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-proxy
-        image: registry.opensource.zalan.do/teapot/hyperkube:v1.12.5
-        command:
-        - /hyperkube
-        - proxy
+        image: registry.opensource.zalan.do/teapot/kube-proxy:v1.12.5-1
+        args:
         - --config=/config/kube-proxy.yaml
         - --v=2
         securityContext:

diff --git a/cluster/node-pools/master-default/userdata.clc.yaml b/cluster/node-pools/master-default/userdata.clc.yaml
@@ -161,8 +161,9 @@ systemd:
       After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service
 
       [Service]
-      Environment=KUBELET_IMAGE_TAG=v1.12.5_custom.master-1
-      Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/hyperkube
+      Environment=KUBELET_IMAGE_TAG=v1.12.5-1
+      Environment=KUBELET_IMAGE_ARGS=--exec=/kube-component
+      Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
       Environment="RKT_RUN_ARGS=--insecure-options=image \
       --uuid-file-save=/var/run/kubelet-pod.uuid \
       --volume dns,kind=host,source=/etc/resolv.conf \
@@ -315,10 +316,8 @@ storage:
           hostNetwork: true
           containers:
           - name: kube-apiserver
-            image: registry.opensource.zalan.do/teapot/hyperkube:v1.12.5
-            command:
-            - /hyperkube
-            - apiserver
+            image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.12.5-1
+            args:
             - --apiserver-count={{ .Values.apiserver_count }}
             - --bind-address=0.0.0.0
             - --insecure-bind-address=0.0.0.0
@@ -530,10 +529,8 @@ storage:
             effect: NoSchedule
           containers:
           - name: kube-controller-manager
-            image: registry.opensource.zalan.do/teapot/hyperkube:v1.12.5
-            command:
-            - /hyperkube
-            - controller-manager
+            image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.12.5-1
+            args:
             - --kubeconfig=/etc/kubernetes/controller-kubeconfig
             - --leader-elect=true
             - --service-account-private-key-file=/etc/kubernetes/ssl/apiserver-key.pem
@@ -604,10 +601,8 @@ storage:
           hostNetwork: true
           containers:
           - name: kube-scheduler
-            image: registry.opensource.zalan.do/teapot/hyperkube:v1.12.5
-            command:
-            - /hyperkube
-            - scheduler
+            image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.12.5-1
+            args:
             - --master=http://127.0.0.1:8080
             - --leader-elect=true
             - --feature-gates=TaintBasedEvictions=true,TaintNodesByCondition={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}},ScheduleDaemonSetPods={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}}
@@ -1024,8 +1019,8 @@ storage:
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
           --net=host \
-          docker://registry.opensource.zalan.do/teapot/hyperkube:v1.12.5 \
-          --exec=/kubectl -- \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
+          --exec=/kube-component -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           label node "$(hostname)" \
           lifecycle-status=draining \
@@ -1037,8 +1032,8 @@ storage:
           --net=host \
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
-          docker://registry.opensource.zalan.do/teapot/hyperkube:v1.12.5 \
-          --exec=/kubectl -- \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
+          --exec=/kube-component -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           drain "$(hostname)" \
           --ignore-daemonsets \

diff --git a/cluster/node-pools/worker-default/userdata.clc.yaml b/cluster/node-pools/worker-default/userdata.clc.yaml
@@ -162,8 +162,9 @@ systemd:
       After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service collect-instance-metadata.service
 
       [Service]
-      Environment=KUBELET_IMAGE_TAG=v1.12.5_custom.master-1
-      Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/hyperkube
+      Environment=KUBELET_IMAGE_TAG=v1.12.5-1
+      Environment=KUBELET_IMAGE_ARGS=--exec=/kube-component
+      Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
       Environment="RKT_RUN_ARGS=--insecure-options=image \
       --uuid-file-save=/var/run/kubelet-pod.uuid \
       --volume dns,kind=host,source=/etc/resolv.conf \
@@ -428,7 +429,7 @@ storage:
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
           --net=host \
-          docker://registry.opensource.zalan.do/teapot/hyperkube:v1.12.5 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           label node "$(hostname)" \
@@ -441,7 +442,7 @@ storage:
           --net=host \
           --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
           --mount volume=dns,target=/etc/resolv.conf \
-          docker://registry.opensource.zalan.do/teapot/hyperkube:v1.12.5 \
+          docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
           --exec=/kubectl -- \
           --kubeconfig=/etc/kubernetes/kubeconfig \
           drain "$(hostname)" \