chore: review feedback

e2e/scenario/vhd.go

@@ -133,9 +133,9 @@ type Ubuntu1804 struct {
 
 // Ubuntu2204 contains all the Ubuntu2204-based VHD catalog entries.
 type Ubuntu2204 struct {
-	Gen2Arm64Containerd               VHD `json:"gen2arm64containerd,omitempty"`
-	Gen2Containerd                    VHD `json:"gen2containerd,omitempty"`
-	Gen2Arm64ContainerdPrivateKubePkg VHD `json:"gen2containerdprivatekubepkg,omitempty"`
+	Gen2Arm64Containerd          VHD `json:"gen2arm64containerd,omitempty"`
+	Gen2Containerd               VHD `json:"gen2containerd,omitempty"`
+	Gen2ContainerdPrivateKubePkg VHD `json:"gen2containerdprivatekubepkg,omitempty"`
 }
 
 // AzureLinuxV2 contains all the AzureLinuxV2-based VHD catalog entries.
@@ -167,7 +167,7 @@ func (c *VHDCatalog) Ubuntu2204Gen2Containerd() VHD {
 
 // Returns the gen2containerdprivatekubepkg catalog entry.
 func (c *VHDCatalog) Ubuntu2204Gen2ContainerdPrivateKubePkg() VHD {
-	return c.Ubuntu2204.Gen2Arm64ContainerdPrivateKubePkg
+	return c.Ubuntu2204.Gen2ContainerdPrivateKubePkg
 }
 
 // Returns the AzureLinuxV/gen2arm64 catalog entry.

parts/linux/cloud-init/artifacts/cse_install.sh

@@ -285,10 +285,12 @@ installKubeletKubectlAndKubeProxy() {
     fi
 
     # if the custom url is not specified and the required kubectl/kubelet-version via private url is not installed, install using the default url/package
-    if [[ ! -f "/usr/local/bin/kubectl-${KUBERNETES_VERSION}" ]] && [[ "$install_default_if_missing" == true ]]; then
-        #TODO: remove the condition check on KUBE_BINARY_URL once RP change is released
-        if (($(echo ${KUBERNETES_VERSION} | cut -d"." -f2) >= 17)) && [ -n "${KUBE_BINARY_URL}" ]; then
-            logs_to_events "AKS.CSE.installKubeletKubectlAndKubeProxy.extractKubeBinaries" extractKubeBinaries ${KUBERNETES_VERSION} ${KUBE_BINARY_URL}
+    if [[ ! -f "/usr/local/bin/kubectl-${KUBERNETES_VERSION}" ]] || [[ ! -f "/usr/local/bin/kubelet-${KUBERNETES_VERSION}" ]]; then
+        if [[ "$install_default_if_missing" == true ]]; then
+            #TODO: remove the condition check on KUBE_BINARY_URL once RP change is released
+            if (($(echo ${KUBERNETES_VERSION} | cut -d"." -f2) >= 17)) && [ -n "${KUBE_BINARY_URL}" ]; then
+                logs_to_events "AKS.CSE.installKubeletKubectlAndKubeProxy.extractKubeBinaries" extractKubeBinaries ${KUBERNETES_VERSION} ${KUBE_BINARY_URL}
+            fi
         fi
     fi
     mv "/usr/local/bin/kubelet-${KUBERNETES_VERSION}" "/usr/local/bin/kubelet"

pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData

@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_redact_cloud_config.py
   permissions: "0744"

pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh

@@ -272,10 +272,12 @@ installKubeletKubectlAndKubeProxy() {
         logs_to_events "AKS.CSE.installKubeletKubectlAndKubeProxy.extractPrivateKubeBinaries" extractPrivateKubeBinaries ${KUBERNETES_VERSION} ${PRIVATE_KUBE_BINARY_DOWNLOAD_URL}
     fi
 
-    if [[ ! -f "/usr/local/bin/kubectl-${KUBERNETES_VERSION}" ]] && [[ "$install_default_if_missing" == true ]]; then
-        #TODO: remove the condition check on KUBE_BINARY_URL once RP change is released
-        if (($(echo ${KUBERNETES_VERSION} | cut -d"." -f2) >= 17)) && [ -n "${KUBE_BINARY_URL}" ]; then
-            logs_to_events "AKS.CSE.installKubeletKubectlAndKubeProxy.extractKubeBinaries" extractKubeBinaries ${KUBERNETES_VERSION} ${KUBE_BINARY_URL}
+    if [[ ! -f "/usr/local/bin/kubectl-${KUBERNETES_VERSION}" ]] || [[ ! -f "/usr/local/bin/kubelet-${KUBERNETES_VERSION}" ]]; then
+        if [[ "$install_default_if_missing" == true ]]; then
+            #TODO: remove the condition check on KUBE_BINARY_URL once RP change is released
+            if (($(echo ${KUBERNETES_VERSION} | cut -d"." -f2) >= 17)) && [ -n "${KUBE_BINARY_URL}" ]; then
+                logs_to_events "AKS.CSE.installKubeletKubectlAndKubeProxy.extractKubeBinaries" extractKubeBinaries ${KUBERNETES_VERSION} ${KUBE_BINARY_URL}
+            fi
         fi
     fi
     mv "/usr/local/bin/kubelet-${KUBERNETES_VERSION}" "/usr/local/bin/kubelet"