bootkube: Use new bootkube image

This commits updates the bootkube image to use a new one which merges the latest upstream bootkube to our forked one. The name of the image tag will be changed upon successfull CI check. Signed-off-by: Imran Pochi <imran@kinvolk.io>
kinvolk · Aug 7, 2020 · 2055675 · 2055675
1 parent da23121
commit 2055675
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -156,7 +156,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-amd64 \
+            docker://quay.io/imran/bootkube:merged-upstream-amd64 \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/assets/lokomotive-kubernetes/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/azure/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -156,7 +156,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-amd64 \
+            docker://quay.io/imran/bootkube:merged-upstream-amd64 \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/assets/lokomotive-kubernetes/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -171,7 +171,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-amd64 \
+            docker://quay.io/imran/bootkube:merged-upstream-amd64 \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/assets/lokomotive-kubernetes/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -157,7 +157,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-amd64 \
+            docker://quay.io/imran/bootkube:merged-upstream-amd64 \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/assets/lokomotive-kubernetes/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/kvm-libvirt/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -167,7 +167,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-amd64 \
+            docker://quay.io/imran/bootkube:merged-upstream-amd64 \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl b/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/cl/controller.yaml.tmpl
@@ -206,7 +206,7 @@ storage:
             --volume bootstrap,kind=host,source=/etc/kubernetes \
             --mount volume=bootstrap,target=/etc/kubernetes \
             $${RKT_OPTS} \
-            docker://quay.io/kinvolk/bootkube:v0.14.0-helm-${os_arch} \
+            docker://quay.io/imran/bootkube:merged-upstream-${os_arch} \
             --insecure-options=image \
             --net=host \
             --dns=host \

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go