Use rancher-mirrored busybox for local-path-provisioner (#2257)

manifests/local-storage.yaml

@@ -74,6 +74,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: HELPER_IMAGE
+          value: rancher/library-busybox:1.31.1
       volumes:
         - name: config-volume
           configMap:

pkg/deploy/zz_generated_bindata.go

@@ -130,7 +130,7 @@ func corednsYaml() (*asset, error) {
 	return a, nil
 }
 
-var _localStorageYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4b\x6f\xe3\x36\x10\xbe\xeb\x57\x0c\x04\xec\xa5\x58\x3a\x1b\xa0\x87\x82\x37\xd7\x8f\xed\x02\x7e\x21\x4e\xdb\x43\xb0\x30\x68\x6a\x6c\x73\x43\x91\x04\x39\x52\xeb\x6e\xf3\xdf\x0b\x4a\x96\x23\xd9\x4e\xe2\xa0\x58\x5e\x9c\x0c\x67\xbe\x79\x7d\x33\x94\x70\xea\x0f\xf4\x41\x59\xc3\xa1\xbc\x4d\x1e\x95\xc9\x38\x2c\xd1\x97\x4a\x62\x5f\x4a\x5b\x18\x4a\x72\x24\x91\x09\x12\x3c\x01\x30\x22\x47\x0e\xda\x4a\xa1\x99\x13\xb4\x63\xce\xdb\x52\x45\x7b\xf4\x2c\xd4\x76\x4c\x1c\x0c\x6b\xf5\xe0\x84\x44\x0e\x8f\xc5\x1a\x59\xd8\x07\xc2\x3c\x61\x8c\x25\x6d\xcf\x7e\x2d\x64\x4f\x14\xb4\xb3\x5e\xfd\x23\x48\x59\xd3\x7b\xfc\x25\xf4\x94\xbd\x29\x6f\xd7\x48\xa2\x09\x6c\xa0\x8b\x40\xe8\xef\xac\xc6\xeb\xa3\xf2\x51\xdb\x17\x1a\x03\x4f\x18\x08\xa7\x3e\x7b\x5b\xb8\xc0\xe1\x21\x4d\xbf\x26\x00\x1e\x83\x2d\xbc\xc4\x4a\x62\x6c\x86\x21\xfd\x08\xa9\x8b\xb1\x05\x42\x43\xa5\xd5\x45\x8e\x52\x0b\x95\x87\xca\xa0\x44\xbf\xae\x94\xb7\x48\x51\x55\xab\x50\xfd\xfe\x25\x48\xee\xd2\xaf\x6f\x3b\x41\x93\x39\xab\x0c\x5d\x74\x54\x0b\x6d\x76\xe2\xeb\xa7\xab\x80\x4b\x8c\xa8\x1d\x43\xe9\x51\x10\x56\xa0\x97\xe3\x0b\x64\xbd\xd8\xe2\xa1\xe2\xe7\xa0\x87\x7b\xa9\x45\x08\x78\x65\x05\xfe\x7f\x7f\x7f\x55\x26\x53\x66\x7b\x7d\x9b\xd7\xca\x64\x49\xec\xf5\x1d\x6e\xa2\x72\x93\xe3\x2b\xde\x13\x80\x73\x5e\x5d\xc3\xa6\x50\xac\xbf\xa1\xa4\x8a\x50\x17\x47\xe6\x47\x0d\x8a\x70\x2e\xdc\x1c\xe7\x74\x88\x4e\xdb\x7d\x8e\xef\x98\xd1\x97\x5d\x05\x87\x92\x57\xbd\x77\x5a\x49\x11\x38\xdc\x26\x00\x01\x35\x4a\xb2\x3e\xde\x00\xe4\xb1\xbf\x13\xb1\x46\x1d\x6a\x41\x2c\xb3\x7b\xc5\x17\x61\xee\xb4\x20\x3c\x98\xb7\x82\x8c\x47\x77\x90\xde\xc2\x02\x68\x42\xac\xfe\xee\x14\x7c\xf6\xbe\x6a\xc7\x43\x56\xa3\xaf\xd8\xd0\x8a\x00\x80\xc1\x23\xee\x39\xa4\x03\xaf\x48\x49\xa1\xfb\x59\x66\x4d\x98\x1b\xbd\x4f\x5b\x5a\x00\xd6\x45\x6b\xeb\x39\xa4\xa3\xbf\x55\xa0\x90\x5e\x00\x89\xdb\xa4\x62\x4c\x2f\x56\xda\x1b\x24\xac\x58\x9f\x8b\x48\xb7\x77\x00\x02\xe0\x66\x83\x92\x38\xa4\x33\xbb\x94\x3b\xcc\x0a\x8d\x8d\x82\xb4\x86\x84\x32\xe8\x8f\x89\xb0\xb7\x38\x50\x1f\x95\x8b\x2d\x72\xf0\xc2\xc8\x1d\xfa\x9b\xcb\xda\xbc\xfc\xd4\xfb\xd4\xbb\xfd\xb9\x6b\xb5\x28\xb4\x5e\x58\xad\xe4\x9e\xc3\x97\xcd\xcc\xd2\xc2\x63\xc0\x63\x71\x63\x50\x79\x2e\x4c\xf6\x5c\x5a\xf6\x56\x34\x0c\x02\x09\x4f\xad\xff\x19\x93\xd6\x6c\xd4\xb6\x25\xba\x41\x92\x37\xb5\xf4\xf0\xd3\xfb\x16\xac\x39\x6a\xd4\x3b\x74\x1a\xfb\x1c\xda\xbe\xeb\x7a\xd4\x16\xac\x56\x6a\x95\x37\x8f\xfa\x0b\x41\x3b\xde\x71\x70\xd4\x40\x53\x9e\x83\x2d\xe6\xc3\xd5\xac\x3f\x1d\x2d\x17\xfd\xc1\xa8\x05\x56\x0a\x5d\xe0\xd8\xdb\x9c\x77\x1a\xb8\x51\xa8\xb3\xc3\x6e\x3a\x93\xd7\xbe\x9b\xf9\xe8\x1d\x47\x34\x69\x67\xf5\x8e\x84\x6a\xf9\x54\xb8\xae\xb7\x33\x56\x1c\xea\x7b\xba\x66\xba\x4f\xc2\xf3\xc2\x59\xd6\xf2\x41\x7c\x0a\x5e\x5d\x39\x71\xff\x1a\x63\xa9\x3d\x5f\xed\x77\xe4\x64\x1e\x54\x60\x19\x6e\x44\xa1\x89\x55\xd7\x1c\x52\xf2\x05\xa6\x49\x9b\x87\x0d\x4f\xa3\x41\xcb\x53\x9d\xfb\xe1\xb9\x98\xda\x0c\x39\xfc\x29\x14\x8d\xad\x1f\x2b\x1f\x68\x60\x4d\x28\x72\xf4\x89\xaf\x9f\xf0\x86\xb4\x43\xd4\x48\x58\x65\x7e\x78\x03\x9a\x92\x25\x27\xdf\x44\xaf\xae\xd6\x23\x41\x5f\xd8\xaa\x8d\x61\x8b\xab\x1c\xfe\x65\xc7\xae\x7c\x3f\x61\x03\xd4\x4b\x23\xf2\x61\x2a\x5c\xca\x1f\xce\xee\xcf\x2d\x3a\x96\x29\x4f\x87\xa3\x71\xff\xf7\xc9\xfd\x6a\xd1\xbf\xff\x6d\x35\x9e\xdf\xad\x66\xf3\xd9\x6a\xf2\x65\x79\x3f\x1a\xae\x66\xf3\xe1\x68\x99\x7e\x7c\x19\x23\x66\x15\x52\xfe\x90\x7e\xf8\xde\xe0\x4c\xe6\x83\xfe\x64\xb5\xbc\x9f\xdf\xf5\x3f\x8f\x2a\xd4\xa7\x0f\xd5\x67\x40\xf7\x3c\x9d\x49\x9e\x75\x9e\x92\xff\x02\x00\x00\xff\xff\x04\x45\x03\xf1\x69\x0a\x00\x00")
+var _localStorageYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4b\x6f\xe3\x36\x10\xbe\xeb\x57\x10\x02\xf6\x52\x2c\xe5\x35\xda\x43\xc1\x9b\xeb\xc7\x6e\x00\xbf\x60\xa7\xed\x21\x58\x18\x14\x35\xb6\xb9\xa1\x48\x81\x1c\xa9\xeb\x6e\xf3\xdf\x0b\xea\xe1\x48\x96\x93\x38\x28\xca\x8b\xec\xe1\xbc\xf8\xcd\x37\x43\xf2\x4c\xfe\x01\xd6\x49\xa3\x19\x29\x86\xc1\xa3\xd4\x09\x23\x5b\xb0\x85\x14\x30\x12\xc2\xe4\x1a\x83\x14\x90\x27\x1c\x39\x0b\x08\xd1\x3c\x05\x46\x94\x11\x5c\xd1\x8c\xe3\x91\x66\xd6\x14\xd2\xdb\x83\xa5\xae\xb2\xa3\xbc\x36\xac\xd4\x5d\xc6\x05\x30\xf2\x98\xc7\x40\xdd\xc9\x21\xa4\x01\xa5\x34\x68\x47\xb6\x31\x17\x11\xcf\xf1\x68\xac\xfc\x9b\xa3\x34\x3a\x7a\xfc\xd5\x45\xd2\x0c\x8a\x61\x0c\xc8\x9b\xc4\xc6\x2a\x77\x08\x76\x63\x14\xdc\x9e\x95\xf5\xda\x36\x57\xe0\x58\x40\x09\xcf\xe4\x67\x6b\xf2\xcc\x31\xf2\x10\x86\x5f\x03\x42\x2c\x38\x93\x5b\x01\xa5\x44\x9b\x04\x5c\xf8\x91\x84\x99\xcf\xcd\x21\x68\x2c\x8c\xca\x53\x10\x8a\xcb\xd4\x95\x06\x05\xd8\xb8\x54\x3e\x00\x7a\x55\x25\x5d\xf9\xfd\x8b\xa3\x38\x86\x5f\xdf\x0e\x02\x3a\xc9\x8c\xd4\x78\x35\x50\x25\x34\xc9\x45\xac\x9f\x6e\x72\x5c\x80\xf7\xda\x31\x14\x16\x38\x42\xe9\xf4\x7a\x7e\x0e\x8d\xe5\x07\xa8\x11\xef\x3b\xad\xf7\x85\xe2\xce\xc1\x8d\x08\xfc\xf7\xfa\xfe\x26\x75\x22\xf5\xe1\xf6\x32\xc7\x52\x27\x81\xaf\xf5\x06\xf6\x5e\xb9\x39\xe3\x2b\xd1\x03\x42\xfa\xbc\xba\x85\x4d\x2e\x8f\xbf\x81\xc0\x92\x50\x57\x5b\xe6\xff\x6a\x14\x9e\x65\x6e\x70\xee\xd3\x09\x64\xca\x9c\x52\x78\x47\x8f\xbe\x1c\xca\x65\x20\x58\x59\xfb\x4c\x49\xc1\x1d\x23\xc3\x80\x10\x07\x0a\x04\x1a\xeb\x77\x08\x49\x7d\x7d\xe7\x3c\x06\xe5\x2a\x81\x87\x39\x7b\x25\x16\x42\x9a\x29\x8e\x50\x9b\xb7\x92\xf4\x4b\x75\x3c\xbd\xe5\x8b\x90\x26\xc5\xf2\x77\x07\xf0\xe5\xfb\xd0\xf6\x0b\x8d\x02\x5b\xb2\xa1\x95\x01\x21\x94\x3c\xc2\x89\x91\x70\x6c\x25\x4a\xc1\xd5\x28\x49\x8c\x76\x2b\xad\x4e\x61\x4b\x8b\x10\x93\x79\x6b\x63\x19\x09\xa7\xdf\xa5\x43\x17\x5e\x71\xe2\xa7\x49\xc9\x98\xc8\x23\x6d\x35\x20\x94\xac\x4f\xb9\xa7\xdb\x3b\x1c\x12\x02\xfb\x3d\x08\x64\x24\x5c\x9a\xad\x38\x42\x92\x2b\x68\x14\x84\xd1\xc8\xa5\x06\x7b\x3e\x08\x7d\x8b\x03\xd5\x92\x29\x3f\x00\x23\x96\x6b\x71\x04\x3b\xb8\xae\xcd\x8a\x4f\xd1\xa7\x68\xf8\x4b\xd7\x6a\x9d\x2b\xb5\x36\x4a\x8a\x13\x23\x77\xfb\xa5\xc1\xb5\x05\x07\x67\x70\x7d\x52\x69\xca\x75\xf2\x0c\x2d\x7d\x2b\x1b\x4a\x1c\x72\x8b\xad\xff\x94\x0a\xa3\xf7\xf2\xd0\x12\x0d\x00\xc5\xa0\x92\xd6\x9f\xe8\x9b\x33\xfa\xac\x51\xcd\xd0\x85\xaf\xb3\x6b\xc7\xae\xf0\xa8\x2c\x68\xa5\xd4\x82\x37\xf5\xfa\x6b\x8e\x47\xd6\x09\x70\xd6\x00\x5d\xf4\x9d\xad\x57\x93\xdd\x72\xb4\x98\x6e\xd7\xa3\xf1\xb4\xe5\xac\xe0\x2a\x87\x99\x35\x29\xeb\x14\x70\x2f\x41\x25\xf5\x6c\xea\xc9\xab\xd8\x4d\x7f\x44\xe7\x16\xed\x05\xfd\x32\x9d\xaf\xa7\x9b\xdd\xdd\x62\xf4\xb9\x17\xb3\x55\x49\x19\x5b\x6e\x4f\x34\xce\xdd\x29\x36\xdf\xd9\x30\xfa\x79\x18\x0d\x83\x36\x44\xef\x40\xa7\x92\x2f\x78\xd6\x4d\xbd\x47\xb1\xba\x58\x97\x33\xab\x7b\xbf\x3c\x4f\xaf\x6d\x25\x1f\xfb\x7b\xe5\xd5\xf9\xe5\x87\xb9\xd6\x06\xdb\xcd\xda\xbe\x94\x2e\x9a\x4b\x3a\x9a\xc0\x9e\xe7\x0a\x69\xb9\xcd\x48\x88\x36\x87\x30\x68\x93\xba\x81\xca\x1b\xb4\x22\x55\x67\xaf\xef\x9e\x85\x49\x80\x91\x3f\xb9\xc4\x99\xb1\x33\x69\x1d\x8e\x8d\x76\x79\x0a\x36\xb0\xd5\x7b\xa0\xe9\x80\x09\x28\x40\x28\x4f\x5e\x5f\x28\x0d\x64\xc1\xc5\x03\xeb\xd5\x39\x7d\x66\xfb\x0b\x23\xba\x31\x6c\x11\x9f\x91\x7f\xe8\xb9\x2a\x3f\x2e\xa8\x45\xaa\x09\xe4\xc9\xb5\xe0\x59\xc8\x1e\x7a\xfb\x7d\x8b\x8e\x65\xc8\xc2\xc9\x74\x36\xfa\x7d\x7e\xbf\x5b\x8f\xee\xbf\xec\x66\xab\xcd\x6e\xb9\x5a\xee\xe6\x77\xdb\xfb\xe9\x64\xb7\x5c\x4d\xa6\xdb\xf0\xe3\xcb\x3e\xfc\xa9\x5c\xc8\x1e\xc2\x0f\x3f\x1a\x3f\xf3\xd5\x78\x34\xdf\x6d\xef\x57\x9b\xd1\xe7\x69\xe9\xf5\xe9\x43\xf9\xa6\xe8\xae\xa7\x9e\xe4\x59\xe7\x29\xf8\x37\x00\x00\xff\xff\xb5\xc6\x5c\xc0\xb6\x0a\x00\x00")
 
 func localStorageYamlBytes() ([]byte, error) {
 	return bindataRead(

scripts/airgap/image-list.txt

 docker.io/rancher/coredns-coredns:1.6.9
 docker.io/rancher/klipper-helm:v0.3.0
 docker.io/rancher/klipper-lb:v0.1.2
+docker.io/rancher/library-busybox:1.31.1
 docker.io/rancher/library-traefik:1.7.19
 docker.io/rancher/local-path-provisioner:v0.0.14
 docker.io/rancher/metrics-server:v0.3.6

scripts/airgap/volume-test.yaml

+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: local-path-pvc
+  namespace: kube-system
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: local-path
+  resources:
+    requests:
+      storage: 2Gi
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: volume-test
+  namespace: kube-system
+spec:
+  containers:
+  - name: volume-test
+    image: rancher/pause:3.1
+    imagePullPolicy: IfNotPresent
+    volumeMounts:
+    - name: volv
+      mountPath: /data
+  volumes:
+  - name: volv
+    persistentVolumeClaim:
+      claimName: local-path-pvc

scripts/test-run-basics

@@ -12,6 +12,7 @@ export NUM_AGENTS=1
 export WAIT_SERVICES="${all_services[@]}"
 
 start-test() {
+    use-local-storage-volume
     docker exec $(cat $TEST_DIR/servers/1/metadata/name) check-config || true
     verify-valid-versions $(cat $TEST_DIR/servers/1/metadata/name)
     verify-airgap-images $(cat $TEST_DIR/{servers,agents}/*/metadata/name)
@@ -34,5 +35,14 @@ verify-airgap-images() {
 }
 export -f verify-airgap-images
 
+# -- create a pod that uses local-storage to ensure that the local-path-provisioner
+# -- helper image gets used
+use-local-storage-volume() {
+    local volume_test_manifest='scripts/airgap/volume-test.yaml'
+    kubectl apply -f $volume_test_manifest
+    wait-for-services volume-test
+}
+export -f use-local-storage-volume
+
 # --- create a basic cluster and check for valid versions
 LABEL=BASICS run-test