Package busybox container image for ceph workaround

Busybox image is not packaged for offline deployments, causing
pod to fail coming up as the image is not available in local
docker registry. Adding image to list of images to pull and
package. Busybox repo in the install template is also updated
in order to get rid of duplicated path and adjust it based on
the path it gets on local registry.

Warning  Failed     118s (x4 over 3m56s)        kubelet, master0   Failed to pull image "engine.local/library/busybox/library/busybox:1.32.0": rpc error: code = Unknown desc = Error response from daemon: manifest for engine.local/library/busybox/library/busybox:1.32.0 not found

Change-Id: Ibc173049c1bae5676dde2a686bd6092761dc645d

diff --git a/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2 b/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
index 089f729f0ba588a29d5d4da438367d315ad69cf2..7a3969a69443291319170e3f67186d16a15dc609 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
+++ b/apps/ceph/kubespray/playbooks/roles/install/templates/ping-tunnel-workaround.yaml.j2
@@ -24,6 +24,6 @@ spec:
       hostNetwork: true
       containers:
       - name: busybox
-        image: {{ busybox_repository }}/library/busybox:{{ busybox_version }}
+        image: {{ busybox_repository }}:{{ busybox_version }}
         command: ["/bin/sh"]
         args:  ["-c", "while true ; do ip route | grep tunl0 | awk -F/ '{print $1}' | xargs -n 1 ping -c 1; sleep 5; done"]

diff --git a/apps/ceph/kubespray/playbooks/roles/install/vars/offline-deployment.yaml b/apps/ceph/kubespray/playbooks/roles/install/vars/offline-deployment.yaml
index aea92a7ef5ff361924543e8a8c843e58fb550b9c..841f878f51b459f58941abf1e37690a8112a3161 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/vars/offline-deployment.yaml
+++ b/apps/ceph/kubespray/playbooks/roles/install/vars/offline-deployment.yaml
@@ -19,7 +19,7 @@
 
 ceph_repository: "{{ server_fqdn }}/ceph/ceph"
 rook_repository: "{{ server_fqdn }}/rook/ceph"
-busybox_repository: "{{ server_fqdn }}/library/busybox"
+busybox_repository: "{{ server_fqdn }}/busybox"
 cephcsi_repository: "{{ server_fqdn }}/cephcsi/cephcsi"
 csi_node_driver_registrar_repository: "{{ server_fqdn }}/k8scsi/csi-node-driver-registrar"
 csi_provisioner_repository: "{{ server_fqdn }}/k8scsi/csi-provisioner"

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index b519494d8f24bf8b56da714ff6a9c1530d6c91ab..04f5325e1781494f4044385af9e1cdd7101d6dad 100644 (file)
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -110,6 +110,9 @@ other_images:
   kube-state-metrics:
     repo: quay.io/coreos/kube-state-metrics
     tag: "{{ kube_state_metrics_version }}"
+  busybox:
+    repo: docker.io/library/busybox
+    tag: "{{ busybox_version }}"
 
 repositories:
   # NOTE (fdegir): OpenDev Git Repositories - Using Nordix Mirrors