Change image repo

Author: willie-yao

templates/test/ci/cluster-template-prow-apiserver-ilb-custom-images.yaml

@@ -13,30 +13,38 @@
       echo "$$LINE_SEPARATOR"
 
       # Custom image handling
-      if [[ -n "${KUBE_APISERVER_IMAGE:-}" ]] && [[ -n "${KUBE_CONTROLLER_MANAGER_IMAGE:-}" ]] && [[ -n "${KUBE_SCHEDULER_IMAGE:-}" ]] && [[ -n "${KUBE_PROXY_IMAGE:-}" ]]; then
-        echo "* Using custom Kubernetes images"
-
-        # Pull and tag custom images
+      if [[ -n "${KUBE_APISERVER_IMAGE:-}" ]]; then
+        echo "* Using custom kube-apiserver image: ${KUBE_APISERVER_IMAGE}"
         echo "* Pulling kube-apiserver: ${KUBE_APISERVER_IMAGE}"
         $${SUDO} ctr -n k8s.io images pull "${KUBE_APISERVER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_APISERVER_IMAGE}" "registry.k8s.io/kube-apiserver:${KUBERNETES_VERSION}"
+      else
+        echo "* Custom kube-apiserver image environment variable not set, using default"
+      fi
 
+      if [[ -n "${KUBE_CONTROLLER_MANAGER_IMAGE:-}" ]]; then
+        echo "* Using custom kube-controller-manager image: ${KUBE_CONTROLLER_MANAGER_IMAGE}"
         echo "* Pulling kube-controller-manager: ${KUBE_CONTROLLER_MANAGER_IMAGE}"
         $${SUDO} ctr -n k8s.io images pull "${KUBE_CONTROLLER_MANAGER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_CONTROLLER_MANAGER_IMAGE}" "registry.k8s.io/kube-controller-manager:${KUBERNETES_VERSION}"
+      else
+        echo "* Custom kube-controller-manager image environment variable not set, using default"
+      fi
 
+      if [[ -n "${KUBE_SCHEDULER_IMAGE:-}" ]]; then
+        echo "* Using custom kube-scheduler image: ${KUBE_SCHEDULER_IMAGE}"
         echo "* Pulling kube-scheduler: ${KUBE_SCHEDULER_IMAGE}"
         $${SUDO} ctr -n k8s.io images pull "${KUBE_SCHEDULER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_SCHEDULER_IMAGE}" "registry.k8s.io/kube-scheduler:${KUBERNETES_VERSION}"
+      else
+        echo "* Custom kube-scheduler image environment variable not set, using default"
+      fi
 
+      if [[ -n "${KUBE_PROXY_IMAGE:-}" ]]; then
+        echo "* Using custom kube-proxy image: ${KUBE_PROXY_IMAGE}"
         echo "* Pulling kube-proxy: ${KUBE_PROXY_IMAGE}"
         $${SUDO} ctr -n k8s.io images pull "${KUBE_PROXY_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_PROXY_IMAGE}" "registry.k8s.io/kube-proxy:${KUBERNETES_VERSION}"
-
-        systemctl restart kubelet
       else
-        echo "* Custom image environment variables not set, skipping custom image handling"
+        echo "* Custom kube-proxy image environment variable not set, using default"
       fi
+
       echo "* checking binary versions"
       echo "ctr version: " $(ctr version)
       echo "kubeadm version: " $(kubeadm version -o=short)
@@ -50,6 +58,9 @@
   path: /spec/kubeadmConfigSpec/preKubeadmCommands/-
   value:
     bash -c /tmp/kubeadm-bootstrap.sh
+- op: add
+  path: /spec/kubeadmConfigSpec/clusterConfiguration/imageRepository
+  value: upstream.azurecr.io/oss/v2/kubernetes
 - op: add
   path: /spec/kubeadmConfigSpec/verbosity
   value: 5

templates/test/ci/prow-apiserver-ilb-custom-images/patches/control-plane-kubeadm-bootstrap-custom-images.yaml

@@ -13,29 +13,12 @@
       echo "$$LINE_SEPARATOR"
 
       # Custom image handling
-      if [[ -n "${KUBE_APISERVER_IMAGE:-}" ]] && [[ -n "${KUBE_CONTROLLER_MANAGER_IMAGE:-}" ]] && [[ -n "${KUBE_SCHEDULER_IMAGE:-}" ]] && [[ -n "${KUBE_PROXY_IMAGE:-}" ]]; then
-        echo "* Using custom Kubernetes images"
-
-        # Pull and tag custom images
-        echo "* Pulling kube-apiserver: ${KUBE_APISERVER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images pull "${KUBE_APISERVER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_APISERVER_IMAGE}" "registry.k8s.io/kube-apiserver:${KUBERNETES_VERSION}"
-
-        echo "* Pulling kube-controller-manager: ${KUBE_CONTROLLER_MANAGER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images pull "${KUBE_CONTROLLER_MANAGER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_CONTROLLER_MANAGER_IMAGE}" "registry.k8s.io/kube-controller-manager:${KUBERNETES_VERSION}"
-
-        echo "* Pulling kube-scheduler: ${KUBE_SCHEDULER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images pull "${KUBE_SCHEDULER_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_SCHEDULER_IMAGE}" "registry.k8s.io/kube-scheduler:${KUBERNETES_VERSION}"
-
+      if [[ -n "${KUBE_PROXY_IMAGE:-}" ]]; then
+        echo "* Using custom kube-proxy image: ${KUBE_PROXY_IMAGE}"
         echo "* Pulling kube-proxy: ${KUBE_PROXY_IMAGE}"
         $${SUDO} ctr -n k8s.io images pull "${KUBE_PROXY_IMAGE}"
-        $${SUDO} ctr -n k8s.io images tag "${KUBE_PROXY_IMAGE}" "registry.k8s.io/kube-proxy:${KUBERNETES_VERSION}"
-
-        systemctl restart kubelet
       else
-        echo "* Custom image environment variables not set, skipping custom image handling"
+        echo "* Custom kube-proxy image environment variable not set, using default"
       fi
       echo "* checking binary versions"
       echo "ctr version: " $(ctr version)
@@ -50,6 +33,9 @@
   path: /spec/template/spec/preKubeadmCommands/-
   value:
     bash -c /tmp/kubeadm-bootstrap.sh
+- op: add
+  path: /spec/template/spec/joinConfiguration/nodeRegistration/imageRepository
+  value: upstream.azurecr.io/oss/v2/kubernetes
 - op: add
   path: /spec/template/spec/verbosity
   value: 5