Merge pull request #285 from hangscer8/adjust_to_multi_harbor_projects

adjust generate_offline_package to multi harbor projects

Author: ErikJiang

artifacts/generate_offline_package.sh

@@ -75,7 +75,10 @@ function create_images() {
 
   while read -r image_name; do
     ## quay.io/metallb/controller:v0.12.1 => dir:somedir/metallb%controller:v0.12.1
-    new_dir_name=${image_name#*/}     ## remote host
+    ## quay.io/metallb/controller:v0.12.1 => dir:somedir/quay.io%metallb%controller:v0.12.1 ## keep host with multi harbor projects
+
+    ## new_dir_name=${image_name#*/}     ## remote host
+    new_dir_name=${image_name} ## keep host
     new_dir_name=${new_dir_name//\//%} ## replace all / with %
     echo "download image $image_name to local $new_dir_name"
     skopeo copy --insecure-policy --retry-times=3 --override-os linux --override-arch ${ARCH} docker://"$image_name" dir:offline-images/"$new_dir_name"

artifacts/import_images.sh

@@ -44,7 +44,7 @@ function import_images() {
     if [ -n "$DEST_USER" ]; then
       copy_cmd=$copy_cmd" --dest-creds=$DEST_USER:$DEST_PASS "
     fi
-    ## dir:offline-images/coreos%etcd:v3.5.4 docker://1.2.3.4:5000/coreos/etcd:v3.5.4
+    ## dir:offline-images/abc.com%coreos%etcd:v3.5.4 docker://1.2.3.4:5000/abc.com/coreos/etcd:v3.5.4
     image_name=${dir_name#*/}      # remove dir prefix
     image_name=${image_name//%/\/} # replace % with /
     image_name="$REGISTRY_ADDR"/"$image_name"

artifacts/offlineDemo/vars-conf-cm.yml

@@ -26,11 +26,11 @@ data:
     override_system_hostname: false
     ntp_enabled: true
 
-    kube_image_repo: "{{ registry_host }}"
-    gcr_image_repo: "{{ registry_host }}"
-    github_image_repo: "{{ registry_host }}"
-    docker_image_repo: "{{ registry_host }}"
-    quay_image_repo: "{{ registry_host }}"
+    kube_image_repo: "{{ registry_host }}/registry.k8s.io"
+    gcr_image_repo: "{{ registry_host }}/gcr.io"
+    github_image_repo: "{{ registry_host }}/ghcr.io"
+    docker_image_repo: "{{ registry_host }}/docker.io"
+    quay_image_repo: "{{ registry_host }}/quay.io"
 
     additional_sysctl:
     - { name: kernel.pid_max, value: 4194304 }