From c38fca3a838767256bf457599b3717949aea7c66 Mon Sep 17 00:00:00 2001 From: "daxapatel@microsoft.com" Date: Mon, 8 Jan 2024 14:54:26 -0500 Subject: [PATCH] chore: review feedback --- e2e/scenario/vhd.go | 8 ++++---- .../linux/cloud-init/artifacts/cse_install.sh | 10 ++++++---- .../AKSUbuntu1604+Containerd/CustomData | 2 +- .../AKSUbuntu1604+Containerd/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line40.sh | 10 ++++++---- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line40.sh | 10 ++++++---- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line40.sh | 10 ++++++---- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line40.sh | 10 ++++++---- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line40.sh | 10 ++++++---- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line40.sh | 10 ++++++---- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line40.sh | 10 ++++++---- .../AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../AKSUbuntu1804+HTTPProxy/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line40.sh | 10 ++++++---- .../AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line40.sh | 10 ++++++---- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line40.sh | 10 ++++++---- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../CustomData | 2 +- .../line40.sh | 10 ++++++---- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line40.sh | 10 ++++++---- .../AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line40.sh | 10 ++++++---- .../testdata/AzureLinuxV2+Kata/CustomData | 2 +- .../testdata/AzureLinuxV2+Kata/line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line35.sh | 10 ++++++---- .../testdata/CustomizedImageKata/CustomData | 2 +- .../testdata/CustomizedImageKata/line35.sh | 10 ++++++---- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- .../CustomData | 2 +- .../line39.sh | 10 ++++++---- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line40.sh | 10 ++++++---- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line40.sh | 10 ++++++---- pkg/templates/templates_generated.go | 10 ++++++---- vhdbuilder/packer/init-variables.sh | 3 +-- vhdbuilder/packer/install-dependencies.sh | 9 ++++----- vhdbuilder/scripts/linux/tool_installs.sh | 19 ++++++++++--------- 146 files changed, 521 insertions(+), 378 deletions(-) diff --git a/e2e/scenario/vhd.go b/e2e/scenario/vhd.go index ec3dd19c21d..cc07cb949d7 100644 --- a/e2e/scenario/vhd.go +++ b/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. diff --git a/parts/linux/cloud-init/artifacts/cse_install.sh b/parts/linux/cloud-init/artifacts/cse_install.sh index ce6a7826623..b6cad71d6b6 100755 --- a/parts/linux/cloud-init/artifacts/cse_install.sh +++ b/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index d043657a965..ce0fd08b9fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh +++ b/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index b8ee60f45c6..b85cda6f442 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index b8ee60f45c6..b85cda6f442 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index dcf90f6ed41..c5a37657a42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index dcf90f6ed41..c5a37657a42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index d043657a965..ce0fd08b9fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index dd3cd0a4f33..5dacbd3d746 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index af5cfb63a9a..9f383a7aa48 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index d043657a965..ce0fd08b9fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index b0b5591a8cf..cf7e301c6a3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXPbOJL3//oUPQwntjMhaXteNo93lecUmfGobEsuSkrubjbLokhI4poktCAoO5H53a/AV5AEJdnOzORuPVXxmAR+aPQbuhstvfhOm7mBNrPCZafT75tj3fgw6OvmYGhOrm+6Gl5RzfoSEaTZOKCWGyASaratrAi+/6yGiKxdG6lukMwd9S/1yb5TsX2LaDJzODD7o+H7wYV5PjC6koaordmBqwWIqo6UvH83GGYvGSp7OXOD9NX56OPwatQ7H9cGOPgu8LDlhFKnbwz6k6tiJD+QuDb1BGPLBaOQaB62LS9bcjSc9AZD3TgXr5xv1eFBjemwLxxOosDmB16+GQvH3UYzRAJEUVgf3e/1f9V3jNRWxF1bFCkry761FiiUOtN30+Fkahr6ld4b61350AtnJkEeskIECgElPOqM9f7U0M3J1dh8NxpNxhOjd2NeTt/pV/rE1P9T75s3V9MLxqgmY1PBUy+cYUxDSqyVtD/eB90YD0bDrrQ+Vk/UY8XyVktLPZU6E/1KvxkZk/MtK1PkoRUmtCKAxsR95PuxN77OaRknxPyoHsP6WP1ZPWG/3qjHUue6Nxy818cT8/3gSr/pTX6tMMC3AneOQqr+M8RBMtg8f2f2ppOROb0570108/1V74Kfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aVOZpObqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0bUVnM96EcXTZOZ7z1q8dz10eASbDgAA8UGZg7yLnE7c6dgEWXQnIMWRvdwT0ENWEK36haGcewwqrBBH5iC3WRoDcYOQWp5XgBhRQF2/pMedw28gyZuhrp+PzRIplqDbBYmSCEnw6a9AlyhIJrAfZC8xSG4ALeigANNWY6hP9HGuGNAFedN8HEsFbKJcUDoGJrDQxeW6CbHKHCS5oUxNItlPE6sryYf//BczXLV8qSJngYSoR1IFL+dW1SlkvDp5ox7/JKZjFy0HPDErNwiQo0onb45/kg72IWvulqLxQlR5l8rqY88YDoYXZxwVkFEBAaYwx1HggBtAboevwUFzK/KoGyyAYlhaxLGxw+jqcMt2BLtbWdRe8ntMSZCbDJDgAeyIguIooMxPuF1xYwlau49EOuWQUp35Up1VIVGCT/DwkAi2fQgTcBB5nnhwTmNlnEAPcsNZW57rlJvMRXEGoq1VEe5dCrJuGJytmoPheNK7ujIng2t9NJ0IBeThRWhSbKI1CmgIUu9yrPbHutpiwvnzMbUCx/JwgEo/JLEttL4FedPGxrj6Luca5wL28Czcvj/oRu5YWpdMsStmkWFf49nnTsam0lMOEb3D5PbGixZuUHGTmZ+cfBwZl9npyCwfpOQEk+BTXeIZYo+97g8HHc5U8+1lTwtPXg/T4CUjLT+f+8NBQZF/67gElJVgUvKePZ1c/HcSYcob9ldK8ticGlcvXrzSYngB0xABi2hhFrnM1OFFSg6i5LPtO+YCUZNaZGZ5HpycHsPPIDWX01L4bLFYgsZyMTMZTnM5hEJnuW2OkR0RNLkav8tDostohjxE9Xtk1wSTnhmr5KEZEa8rLSldhWeadvsmzMK0UJ15eKbamCD1zg0cfBeqAaKadRsq1AuVIvJSbM9FAdXkzWMjsFjz3CC61yzf+eUnTQQqcXokH7phz7j+5acj5i9Omprz7eyH+Fv3k3uYUhufFAt3uE3nWsDseNmVHkE7jxi3EF0GPd+lkYRo1abzLizCnZtzy/UiguBHZg+/HAOLLUGZj69Awa2AxfOIeFLVHAqy995o3c/bS3wXgGIAwZiesX9AepoguBN46WOHYf7l55+fh5a618KHFY76oxX646XrlwHtHBMIl66fO28WkMhtecZfwcEFtTM3sMhnQdCx4fFiFiZQAiooR1vCzjsr9Ku2Z9mh4ruEYKImzp7Fi4nJlbMUNkthq4VabVXeN+xadu56KFX8er7FBzR7uJBaFPV77Yn5B3FEyBtZ2y75tRi8Eq7cQGkILQu5Hg3muYslFcAJWLWXga9TC3/sbqrKGSvrE0mAEhFPDMCGn759ecJ0FyGQueQW3moOWmss4IQHWBC0AkUH6R+HjOQz9dXRw+FvSP9EiPrqSJbg5Us4tC1ahXj5kvNFl8Z0PGEmXT+fj/4AbuXiega/Uoh/F47d3YXPYheb/w3yKj160nPnK9jaV8DeopnPR2+VIu9W2S8HB4g/SvPE4ok5wYehPjH/4MRAtOYjs4N+Uoku9pyVofNKqHySPr2Zmj2j/2tXPlwg2r+Z9oi9PKozqVnt5iGL51Pjap9jk7gKxdgLtbW8qVIVa4l0XRRmdXSlOURJDlRF3uSkxyq1iLr4IvE0JbzU05SuSWUivaqgksInUz04ybyNJNq3VuDlK6R5XHONmK8q1kTRznQ7IgQF9EMWn8mHKR9AUfJQ77TibELkwEHOraJSpWmLg6NqPl4FjiX4rguSIBdPw8EcqDEP8ByyxSyPIMv5nKfoyFEhvHVXKzdYQGXfbA61yAJRKHGbBc7v1VexeiwoQ9RFKj1VN0qGZBHSvgIWBo15LaIhfJZVCapZK4IU27KXyMk5WBQUz1o4J9WPxogEcFJ3d+US02Bl2bcMJlvBDSguKcyuKLgyErUIfLlfP4YXSr8JWEuwyuxKrg7M9LTTPAa2DKymRZP8MqZW36g4ocy5lXc0hdc7fUx1IWV4JX9PZypfQN5UjL3NkHKygYUuK4tYPqKIJAlcy47gzgoTzVi4a8SlM6XjL7dVkKAbRqVqVlLZ4EErqcU1V6Xg/QwqygNk6y3bbj+82To/Li/omEtobphFeVVpacJxJQ5XeNi075X38G1q+XRN608NQx9OStU9LAW04zRoSnJdnghpOj3pGRd6CS5ld48ZySHy14j0sb+yCGLmXqXlTJGO1WP1WIqZglWQYqFqZYeIxx0W0CSysU4MbsjCaYuZDF1aARxiAuhfkeUBxUf5oTKzQsSB1Ahqnko1WamCI6fNNrepYuIGGssXkP76K2ly283zXvqb34Ak6tt0w18dPnMFxVm5ff/MoEJEo1V/ODh3SdgSsGcUdUBc0hOM4Up0lbcC8LJxZCt+Y1h5klXfclEgl4E859YhCfwHBjc3Q/pepYsvMRtSOaycLTlHhiOKcfx1dkFRmRfXJmqvmvyuXiJVAq6dqY8w1Np1JzccqNzVjwTcH8KSGwt7lPsv+1HEAp76DnOwXdpXCr+Rgz47x9xDDeDfTxdyPqv15L/Uiso945+pGuieEsuml9EMvcvy3tp93e2bkKvVZ5WO7FU0Q2ZWDEnq1fKpVPdnm0b3V1wDp4svJvVXXXlTwxOkyKJaRmMBTd5wuElyXEOulTF4hMqFTSIJhRIrCOeY+F0pfFBfPbxU0gXy+s+DBIoSLvFdORI5SmD5KGRyTFKb3UT+vZC/ooSUuCvFxv4KB0zFuj8yOVdvGYBriguwg5KWx9v08rX1XZ7QpL1Se5DF6chN2m/3tVXlUYqQXcQkKay5ul10pVTBiobBuLEB3vXMkzJEMVtk31m0mCbJWWshVCaxiDBJmV/Dnet5EIWIRYZUEMPtAVYk4FItEs+S7NyWs/ClqgO5vJVXohc29ZRXnd0GVOXILmO5MQYfehM9MZqby4si4/p6tlKl5w+zi/KgzFoYLtMXvcBh/3dD8P3n8uicjiej6+RWlbnTnvFftRokyyQaQ6bG1Vk3q30UfNwCIRrDY6T6FYUss8jaYVmWfwbiqZU84TXYUUixn0/YsaNsxYxDZtZxZrpz03dDRkCXkgjx1vZdmv3vwhVkos9S9T0O6Hb5qoLzUALBQ3F/5B7bLQORdk7OrdyJIK/Cy51CbTLz2awQuP2CI4J3rYzZSbugyJWGaS3yFneowqdP8PJlWnFuZ3HS/McUtsmwF5PR+egM0p5j9gpsHDguZZm9vUT2LeAAagYJOLARGDdgL61ggdgJkfX/OHzgeXiY9TqIeZS3RUqqlDRGwtsunPzl6CjZDygBc421hVtuyP9E/a8TWK8U54W5tVCuzMBb5NoyXNoGt0VNWoZLHS6Xtn64b/FCLT7oWSc1aEvsI235eYUIe6gUrf5pZ+Eq4nosB761KDvD+1cDczIaFVXnog/HHFz3LvS0IH3KHRkMK+kWXiJw/TQqEUyKIT1b5E2+QlzpjSsfJ820NiWCiKpVGdm6jBCbElW8vASS6DL+l2M4YdHLMdiUBR1J+LCybMTCSNXF2ZYYNteTVOImxaOs64i6PnIARxRynmzlx9q1INlm5bKc63vqT9j4C/NmWjb5HlV8eYNr6T3LUxiXzHwy79L7md+NS9m2WhmV3ra08YqLonfy4akccLB9i8jvxoEUvsaB81H/Um9TkfSeiSBqLZ5v6YY+6V3wj3/kHECyxoJtY06w37aL5OauhvNVfMJWu6XWQigOkGukPM2s8nvJJ61VKdAn2vMUHE7O130jkXD4HpP+0g2sZh97CWtMh0xfsg+x2FyXf2OXlucV0N1D+XAbx0Pw3JDmfUMH//BtovquTXCI51S1sa8dwANYd7dwsFkRN6Agn8QHRwJTra/K8yjcb4GQEuhCmKwzP5S+D8++D6XXIJ+8Bvn0KIaMgpCSgoTKlaMkb3gqMl61ZvrMKyCHafrcDRzw7YLaOSaQiKiemfNrskG+nRpp0gJbWfy3//j0g9R4FEtxpSG2ogfdIkTMYePsVk1BcBBqAt6xJ9YXJlA7KO7Ynq9BBWlVV5SZNE+fvKlsoYz5Gp9wEuLlfnIvyFp/VRqmP99ZlqwqnFrCoZy2Bncq1k98ofE37SPzPcR32yekziH5ROF0lSpNrc6WXjpm6pJuDd2vMKH8mxQrCuw0c0k/oJjCGVF5OwxP/WDhNq61+t5iYkIHO9QdFhWjssuocBVVdyOdSfJpfFD0Nq71PBuqRfbyg/Cx+tux8v8+/dDyVhE/NqV8PXnDcTZOO9MP2H9/Dw6qDZENlW/b7j7+uO5yv/3tb/t4o4AL1fNBUeaY+BaFg81GNdAKhy7F5HMcn2026sRaxN86B7jdp5bK4j7Txg7qyv+/5pbl4h1814Vjsa2kcWMxkuNtYXp1rrb31UFx6AlnPcDd0vUQEGQ5qUQqp9SznUX+I3LZlegtoy5uzBbaViskd6604HHigvxMqb2Lee+qzBt+tFpd57KMpHXo5PQ4vTZV7ObM0skX5Zeat08DgUPHoujotXy4xCFlDuPoNYTUIrQvnJ3WL/jTA6SknJB8RYW0AxgFTgts+Sl3I8kdkFOjttDIrP2kfzWanmfamN53svC27+FIFG387zuD0jC2CLwO/vRT4TEE/VF+el+aOHr+j3m2PFz+dnya4Iqy6E8rP+eeGXuS4dTNtxmnVunkXFjqOZtnK/82t9yarxW41caIJo9EDjv3hOJ3Igda8dqNIWlBtr51p/JtH8aOb/vAa0SI66DsQ+x9HMzdRZm6pN1b3HeoJF8gxLif/qva84XqaG+OzeSjDWaAWIjAMNibVELZF5hsamCp0tgWhb/9TR+9h7dvBUMci1ohjoiNzpLhiQqclYn+auV9Zosy2rOFzyC9uNJH7ztx5wX79T8BAAD//x+Jt1eKSQAA + H4sIAAAAAAAA/+R8e3PbOJL4//oUPQwntjMhaXsem593Nb9TZMajsi25KCm5u2yWRZGQxDVJaEFQdiLzu1+BT5AEJdnOzORunarIJoBGo9/daOrFd9rMDbSZFS47nX7fHOvG+0FfNwdDc3J909XwimrWl4ggzcYBtdwAkVCzbWVF8P1nNURk7dpIdYNk7ah/qU/2XYrtW0STlcOB2R8N3w0uzPOB0ZU0RG3NDlwtQFR1pGT87WCYDTKobHDmBunQ+ejD8GrUOx/XJjj4LvCw5YRSp28M+pOrYiY/kbg29QRzyw2jkGgeti0v23I0nPQGQ904F++cH9XhgRrTYV84nUSBzU+8fDMWzruNZogEiKKwPrvf6/+m75iprYi7tihSVpZ9ay1QKHWmb6fDydQ09Cu9N9a78qEXzkyCPGSFCBQCSnjUGev9qaGbk6ux+XY0mownRu/GvJy+1a/0ian/p943b66mF4xQTcKmjKdeOMOYhpRYK2l/eO91YzwYDbvS+lg9UY8Vy1stLfVU6kz0K/1mZEzOt+xMkYdWmNAKAxoL9+Hvh974OsdlnCDzo3oM62P1Z/WEfbxRj6XOdW84eKePJ+a7wZV+05v8ViGAbwXuHIVU/WeIg2Syef7W7E0nI3N6c96b6Oa7q94Fv3ZtEc1zZ2yl4sw0K6JYiVaORZHU6U+NK3M0ndxMJ12N+ivNjohnrhGZ4RCpOKKdDkE+XqNrKzif9SKKp8nKd561eOd66PAINh0AAOKDMgd5FzqduNOxCbLoToAUR/ZyT4AesoJo1S8U5dxjoMIKcmQOcpumMSBuEFLL8wogRhRQ1y/xcefwESR5M9T187FZQool6HZBoiRCEnz6K9AlCpIF7AfZSwySG0ALdFCASasx1Cf6OBcM6IK8aT6OpQJsIlxQGgbGsNDF5b4JssocJLkhTE0k2U8TVleSD//5L6a4ajmoImeBhFCPpAq8nFpVo5DR6uSNevyTGI9duBzwyKzcIECOKp28Of5JOtgHrblbssYLUWUs5dWHnjEcDC/OOCwgwwICTGGOo8ABN4BcD1+Dg+ZW5FE3WADFsLSIY2OH4dXhtu0ITreyqL3kz5iiIDcJIMED2BEFxVFAmZ9wp+LmErR2HwnplIOUysyX6qoKihJ8goeHhLHtUxiDg8jzxJNzHCvzBHKQK87a8lynPGTOijMQHa0K4d6lIOuGwemqORiOJ72rK3MyuNZH04mQQR5ehCbFJlqjgIYg9S7Han+sqy0qnD8fUytwLA8HqLRDEjtC6yjImzYyxtWxnGqcCdjDsnDnfq8buWFp3TKFXVGLDPY1nn3uZGQqLeUQ0TtMbm+8aOEGFTOZ2cnJh5FxmXlHpvkgJR5Mgk91jmcQe2y4Pxx0OFXNj5c9LSx5PUyDlwy13D/3h4MCI//WcQkoK8GiZJw9nVz8dxJhyhv2V4ry2JwaVy9evNJieAHTEAGLaGEWuUzV4UWKDqLks+075gJRk1pkZnkenJwew88gNbfTUvDZZrEEje1ipjKc5HIQCpnljjlGdkTQ5Gr8Ng+JLqMZ8hDV75FdY0zqM1bJQzMiXldaUroKzzTt9k2YhWmhOvPwTLUxQeqdGzj4LlQDRDXrNlSoFypF5KXYnosCqsmbx0Zgsea5QXSvWb7zy0+aCKjEyZF86IY94/qXn46YvThpSs63cx7ibz1PbmFKaXxSLNzhDp1LAdPjZVd6BO48xLgF6TLo+S6NJES7No13oRHu3JxbrhcRBD8yffjlGFhsCcp8fAUKbgVYPI+IJ1XVoUB774PW7by9xHcBKAYQjOkZ+w+kpzGC88BLHzsM5l9+/vl50FLzWtiwwlB/sEJ/vHT9MqCdYwLh0vVz480CErktz/grOLjAduYGFvksCDo2PLyYhQmUgArK0Zaw884K/aruWXao+C4hmKiJsWfxYqJy5SqFrVLYbqFW25W3Dbu2nbseSgW/nm/xAc0eJqQWRf1eZ2L2QRwR8krWdkp+LwZeCVduoDSYloVcjwbmuYslFYATkGovBV+nGv7Y01SFM1bWJ5IASkQ8MQA2/fTXlydMdhECmUtu4VfNQWuNBZzwAAuCVqDoIP3jkKF8pr46ejj8iPRPhKivjmQJXr6EQ9uiVRAvX3K26NKYjidMpev++egPoFbOrmfQKwXx70Kxu7vwWeRi679BWqWuJ/U7X0HXvgLsLZL5fOitXOTNKvtwcIB4V5onFk/MCd4P9Yn5BycGoj0fmR30k0p0ceasDJ1XQuWT9OnN1OwZ/d+68uEC0f7NtEfs5VGdSM1qNw+yeD41rvZxm8RVKMZeqK3lTRWrWEu466Iwq6MrzSlK4lAVeZOjHqvUIurii8TjlNBST1O6JpYJ96qMSgqfTPTgJLM2kujcWgEv3yHN45p7xHxVscaKdqLbESEooO+z+Ew+TOkAipKHeqcVYxMiBw5yahWVKk1bHBxV8/Eq4FiC77ogCXLxNBzMATXWAZ5DtpnlEWQ5n/MUHTkqhLfuauUGC6icm62hFlkgCiXcZoHze/VVrB4LyhB1lkpPlY2SIFmEtC+DhUFjXotoMJ9lVYJq1oogxbbsJXJyChYFxbMWykl11xiRAE7q5q7cYhqsLPuWgcl2cAOKSwyzKwqujEQtAl/u14+hhdJvAqwlWGV2JVcnZnLaabqBLROradEkv4yp1TcqRigzbuUdTWH1Th9TXUgJXsnf05XKF5A3FWVvU6QcbWChy8oilo8oIkkC13IiuLPCRDIW7hpx6Uxp+MtjFSjohlGpmpVYNmjQimpxzVUpeD8Di9KBbL1l222HN1vXx+UFHTMJzQOzKK/KLU04r4TDFR427WflLXybWD5d0vpTw9CHk1J0D0sG7fAGTU6uS4+QptOTnnGhl8Cl7O4xQzlE/hqRPvZXFkFM3au4nCnSsXqsHksxE7AKpFgoWpkT8ThnAU0kG/vE4IYsnLaYytClFcAhJoD+FVkeUHyUO5WZFSIOSA2hpleq8UoVuJw23dwmiokZaGxfgPTXX0mS226e95Lf/AYkEd+mGf7q4DNTUPjK7ednChUiGq36w8G5S8KWgD3DqAPikp5gDleiq4wKgJeNI1vhN6aVnqw6ykWBXAbynFuHJPAfGNzaDNL3Kl18idmUirNytuQcGRxRjOOvswuKyrq4tlB71aR39RKpEnDtTH2EodauO7nhQOWufiTg/hCW3FjYo9x/2Q8jFvDUT5gD2yV9JfMbOeizc8w9xAD+/WQhp7NaT/5LqajcM/6ZooHuKbFsehnN0Nss763d192+CblafVbpyIaiGTKzYkhSr5ZPpbo92zS6v+IacLr4YlJ/1ZU3NXiCFFlUy2hsoMkbDm6SHNcg18oYPITKhU3CCYUSKwjnmPhdKXxQXz28VNIN8vrPgwSKEi7xXTkTOUpg+ShkfExSm91I/r3gv6KElLgrxcb+CgdMxLo/Mj5XbxmAa4oLsIOSlsfb9PK1dSxPaNJeqT3Q4mTkJu23+9qi8ihByC5ikhTWXN0uulIqYEXDYNw4AG965kkZolgt0u8sWkyT5Ky1ECqLWESYpMyv4c71PIhCxCJDKojh9gBWJOBSLRLPkuxcl7PwpSoDOb+VV6IBm3rKq85uBapSZJey3BiD972JnijNzeVFkXF9PV2p4vOH6UXpKLMWhst0oBc47Lcbgu8/l65zOp6MrpNbVWZOe8Z/1WqQLJNoTJkaV2fdrPZR0HELCNEcHkYqX1HIMousHZZl+WcgXlrJE16DHYUU+/mCHSfKdswoZGYdZ6Y7N303ZAh0KYkQr23fpdn/LriCTPRZor6Hg27nryrwhxIIHor7I/c4bhmItFNybuVGBHkVWu5kapOYzyaFwOwXFBGMtRJmJ+6CIlcaprXwW9yhCp/SG+gti5kUtS6u94Vlxet2biV9hEz2xbHii8nofHQGaQszGwYbB45LXRyAvUT2LeAAavoNOLARGDdgL61ggZjDydqJnApsdw6Hh1n7hJjseaelpEpJryX82oWTvxwdwcuX8BGUgFnb2uYtl+5/slrVkazgxhWhs1/z8t/6sQLQMl3aBm6LMLZMlzpcxm79cN9i61os3bPiAdCW2Efa8vMKEfZQKV4oSPsXVxHXyTnwrUXZf96/GpiT0aiobRfdPubgunehp2XvU84xMVhJT/ISgeunsY9gUQypB5M3+Q5xpQOvfJy07NqUCBS1VTbZvgwRmxJVvL0EkujK/5djOGEx0jHYlIU2SZCysmzEglXVxdmRGGyu86mEm5Sost4m6vrIARxRyGmylR5r14LkmJUrea67qj9h8y/Mm2nZSnxU8RgNqqW3OU8hXLLyybRLb4F+Nyplx2olVHqn00YrLlbfSYenUsDB9i0ivxsFUvA1CpyP+pd6m4ikt1kEUWvxfE039Envgn/8I2cAkj0W7Bhzgv22UyT3gzU4X8UmbNVbai2E7AC5hsrT1Cq//XzSXpVrgER6ngKH4/N130g4HL7DpL90A6vZLV+CNaZDJi/ZqzI29y5B45SW5xWgu4fy4TaKh+C5Ic27kw7+4dtE9V2b4BDPqWpjXzuAB7DubuFgsyJuQEE+iQ+OBKpa35WnUbjfBiEl0IUw2Wd+KH0fnn0fSq9BPnkN8ulRDBkGISUFCpWLTUne8FhktGqtJzCrgBwm6XM3cMC3C2znmEDConr+z+/JJvl2qqRJo21l84//8ekHqfEoluJK221FDrpF1JiDjbO7OwXBQagJaMeeWF8YQ+2guMl7vgQVqFVNUabSPH7ypnKEMgRsvEclhJfbyb1A1rq40uj9+cayJFVh1BIK5bg1qFPRfuILlb+pH5ntIb7bviA1Dsl7i9NVKjS1al56tZmJS3o0dL/ChPIjKawosNOEJn0NMgVnROUdNDz19cVtVGu1vcXCBA/m1B0WFaOyl6kwFVVzI51J8ml8UHRQrvU8QapF9vKD8LH68Vj5f59+aBlVxI9NKd9P3nCUjdP+9wP27+/BQbXtsiHybcfdxx7XTe63f/xtL1EKqFD1D4oyx8S3KBxsNqqBVjh0KSaf4/hss1En1iL+1inAnT7VVBb3mTZ2UFf+/zWzLBdj8F0XjsW6ksaNxUyOtoXq1ana3r0HhdMTrnqAu6XrISDIclKOVLzUs41F/iMy2ZXoLcMubqwW6lYrSM6vtMDj2AW5T6mNxbx1VeYNO1qt4XNZRtKgdHJ6nF7OKnZzZWnki2pMzdqngcChY1F09Fo+XOKQMoNx9BpCahHaF65O6xe89wApKSckX4Qh7QCMAqcFbPkuvZHkDsipYVtIZNbk0r8aTc8zaUxvVVl42/dwJIo2/vf5oDSMLQKvgz/dKzwGoT/KTu+LE4fP/zHLlofL345NE1yEFl1w5dv0mbInGU5dfZtxahVPzoSllrPpW/nRXHNrtlZgVhszmjQSGezcEorHRAa0YrUbU9KCbP3oTuU7RYwd3ymC14gQ10HZq/J9HMzdRZm6pD1i3De1JF9TxKif/q/a84XqaG+OzeQFCjNALERgMNhIyqHsa1I2NWCp0NgWhb/9TR+9g19/FUxxLGqFOCI2OkumJyJwVib6q5X3mW3KcM82PoP0ekwfvevEnRfs438CAAD//yEZ8LDwSQAA - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index d043657a965..ce0fd08b9fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 7805ed883c8..99a4cbf19a3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index bef27f77a85..ffcd430cbd2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/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" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 7805ed883c8..99a4cbf19a3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 428e4f26c40..dd52ea4be15 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 95f46292670..9145009fad8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index aaabf3fa837..ba3da51e77a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index a359a692379..68061d07177 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 5093a087ca9..18854c824ea 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 95f46292670..9145009fad8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 95f46292670..9145009fad8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index b0cc7142635..fc3d6f8154a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXPbOJL3//oUPQwntjMhaXteNo93lecUmfGobEsuSkrubjbLokhI4poktCAoO5H53a/AV5AEJdnOzORuPVXxmAR+aPQbuhstvfhOm7mBNrPCZafT75tj3fgw6OvmYGhOrm+6Gl5RzfoSEaTZOKCWGyASaratrAi+/6yGiKxdG6lukMwd9S/1yb5TsX2LaDJzODD7o+H7wYV5PjC6koaordmBqwWIqo6UvH83GGYvGSp7OXOD9NX56OPwatQ7H9cGOPgu8LDlhFKnbwz6k6tiJD+QuDb1BGPLBaOQaB62LS9bcjSc9AZD3TgXr5xv1eFBjemwLxxOosDmB16+GQvH3UYzRAJEUVgf3e/1f9V3jNRWxF1bFCkry761FiiUOtN30+Fkahr6ld4b61350AtnJkEeskIECgElPOqM9f7U0M3J1dh8NxpNxhOjd2NeTt/pV/rE1P9T75s3V9MLxqgmY1PBUy+cYUxDSqyVtD/eB90YD0bDrrQ+Vk/UY8XyVktLPZU6E/1KvxkZk/MtK1PkoRUmtCKAxsR95PuxN77OaRknxPyoHsP6WP1ZPWG/3qjHUue6Nxy818cT8/3gSr/pTX6tMMC3AneOQqr+M8RBMtg8f2f2ppOROb0570108/1V74Kfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aVOZpObqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0bUVnM96EcXTZOZ7z1q8dz10eASbDgAA8UGZg7yLnE7c6dgEWXQnIMWRvdwT0ENWEK36haGcewwqrBBH5iC3WRoDcYOQWp5XgBhRQF2/pMedw28gyZuhrp+PzRIplqDbBYmSCEnw6a9AlyhIJrAfZC8xSG4ALeigANNWY6hP9HGuGNAFedN8HEsFbKJcUDoGJrDQxeW6CbHKHCS5oUxNItlPE6sryYf//BczXLV8qSJngYSoR1IFL+dW1SlkvDp5ox7/JKZjFy0HPDErNwiQo0onb45/kg72IWvulqLxQlR5l8rqY88YDoYXZxwVkFEBAaYwx1HggBtAboevwUFzK/KoGyyAYlhaxLGxw+jqcMt2BLtbWdRe8ntMSZCbDJDgAeyIguIooMxPuF1xYwlau49EOuWQUp35Up1VIVGCT/DwkAi2fQgTcBB5nnhwTmNlnEAPcsNZW57rlJvMRXEGoq1VEe5dCrJuGJytmoPheNK7ujIng2t9NJ0IBeThRWhSbKI1CmgIUu9yrPbHutpiwvnzMbUCx/JwgEo/JLEttL4FedPGxrj6Luca5wL28Czcvj/oRu5YWpdMsStmkWFf49nnTsam0lMOEb3D5PbGixZuUHGTmZ+cfBwZl9npyCwfpOQEk+BTXeIZYo+97g8HHc5U8+1lTwtPXg/T4CUjLT+f+8NBQZF/67gElJVgUvKePZ1c/HcSYcob9ldK8ticGlcvXrzSYngB0xABi2hhFrnM1OFFSg6i5LPtO+YCUZNaZGZ5HpycHsPPIDWX01L4bLFYgsZyMTMZTnM5hEJnuW2OkR0RNLkav8tDostohjxE9Xtk1wSTnhmr5KEZEa8rLSldhWeadvsmzMK0UJ15eKbamCD1zg0cfBeqAaKadRsq1AuVIvJSbM9FAdXkzWMjsFjz3CC61yzf+eUnTQQqcXokH7phz7j+5acj5i9Omprz7eyH+Fv3k3uYUhufFAt3uE3nWsDseNmVHkE7jxi3EF0GPd+lkYRo1abzLizCnZtzy/UiguBHZg+/HAOLLUGZj69Awa2AxfOIeFLVHAqy995o3c/bS3wXgGIAwZiesX9AepoguBN46WOHYf7l55+fh5a618KHFY76oxX646XrlwHtHBMIl66fO28WkMhtecZfwcEFtTM3sMhnQdCx4fFiFiZQAiooR1vCzjsr9Ku2Z9mh4ruEYKImzp7Fi4nJlbMUNkthq4VabVXeN+xadu56KFX8er7FBzR7uJBaFPV77Yn5B3FEyBtZ2y75tRi8Eq7cQGkILQu5Hg3muYslFcAJWLWXga9TC3/sbqrKGSvrE0mAEhFPDMCGn759ecJ0FyGQueQW3moOWmss4IQHWBC0AkUH6R+HjOQz9dXRw+FvSP9EiPrqSJbg5Us4tC1ahXj5kvNFl8Z0PGEmXT+fj/4AbuXiega/Uoh/F47d3YXPYheb/w3yKj160nPnK9jaV8DeopnPR2+VIu9W2S8HB4g/SvPE4ok5wYehPjH/4MRAtOYjs4N+Uoku9pyVofNKqHySPr2Zmj2j/2tXPlwg2r+Z9oi9PKozqVnt5iGL51Pjap9jk7gKxdgLtbW8qVIVa4l0XRRmdXSlOURJDlRF3uSkxyq1iLr4IvE0JbzU05SuSWUivaqgksInUz04ybyNJNq3VuDlK6R5XHONmK8q1kTRznQ7IgQF9EMWn8mHKR9AUfJQ77TibELkwEHOraJSpWmLg6NqPl4FjiX4rguSIBdPw8EcqDEP8ByyxSyPIMv5nKfoyFEhvHVXKzdYQGXfbA61yAJRKHGbBc7v1VexeiwoQ9RFKj1VN0qGZBHSvgIWBo15LaIhfJZVCapZK4IU27KXyMk5WBQUz1o4J9WPxogEcFJ3d+US02Bl2bcMJlvBDSguKcyuKLgyErUIfLlfP4YXSr8JWEuwyuxKrg7M9LTTPAa2DKymRZP8MqZW36g4ocy5lXc0hdc7fUx1IWV4JX9PZypfQN5UjL3NkHKygYUuK4tYPqKIJAlcy47gzgoTzVi4a8SlM6XjL7dVkKAbRqVqVlLZ4EErqcU1V6Xg/QwqygNk6y3bbj+82To/Li/omEtobphFeVVpacJxJQ5XeNi075X38G1q+XRN608NQx9OStU9LAW04zRoSnJdnghpOj3pGRd6CS5ld48ZySHy14j0sb+yCGLmXqXlTJGO1WP1WIqZglWQYqFqZYeIxx0W0CSysU4MbsjCaYuZDF1aARxiAuhfkeUBxUf5oTKzQsSB1Ahqnko1WamCI6fNNrepYuIGGssXkP76K2ly283zXvqb34Ak6tt0w18dPnMFxVm5ff/MoEJEo1V/ODh3SdgSsGcUdUBc0hOM4Up0lbcC8LJxZCt+Y1h5klXfclEgl4E859YhCfwHBjc3Q/pepYsvMRtSOaycLTlHhiOKcfx1dkFRmRfXJmqvmvyuXiJVAq6dqY8w1Np1JzccqNzVjwTcH8KSGwt7lPsv+1HEAp76DnOwXdpXCr+Rgz47x9xDDeDfTxdyPqv15L/Uiso945+pGuieEsuml9EMvcvy3tp93e2bkKvVZ5WO7FU0Q2ZWDEnq1fKpVPdnm0b3V1wDp4svJvVXXXlTwxOkyKJaRmMBTd5wuElyXEOulTF4hMqFTSIJhRIrCOeY+F0pfFBfPbxU0gXy+s+DBIoSLvFdORI5SmD5KGRyTFKb3UT+vZC/ooSUuCvFxv4KB0zFuj8yOVdvGYBriguwg5KWx9v08rX1XZ7QpL1Se5DF6chN2m/3tVXlUYqQXcQkKay5ul10pVTBiobBuLEB3vXMkzJEMVtk31m0mCbJWWshVCaxiDBJmV/Dnet5EIWIRYZUEMPtAVYk4FItEs+S7NyWs/ClqgO5vJVXohc29ZRXnd0GVOXILmO5MQYfehM9MZqby4si4/p6tlKl5w+zi/KgzFoYLtMXvcBh/3dD8P3n8uicjiej6+RWlbnTnvFftRokyyQaQ6bG1Vk3q30UfNwCIRrDY6T6FYUss8jaYVmWfwbiqZU84TXYUUixn0/YsaNsxYxDZtZxZrpz03dDRkCXkgjx1vZdmv3vwhVkos9S9T0O6Hb5qoLzUALBQ3F/5B7bLQORdk7OrdyJIK/Cy51CbTLz2awQuP2CI4J3rYzZSbugyJWGaS3yFneowqdP8PJlWnFuZ3HS/McUtsmwF5PR+egM0p5j9gpsHDguZZm9vUT2LeAAagYJOLARGDdgL61ggdgJkfX/OHzgeXiY9TqIeZS3RUqqlDRGwtsunPzl6CjZDygBc421hVtuyP9E/a8TWK8U54W5tVCuzMBb5NoyXNoGt0VNWoZLHS6Xtn64b/FCLT7oWSc1aEvsI235eYUIe6gUrf5pZ+Eq4nosB761KDvD+1cDczIaFVXnog/HHFz3LvS0IH3KHRkMK+kWXiJw/TQqEUyKIT1b5E2+QlzpjSsfJ820NiWCiKpVGdm6jBCbElW8vASS6DL+l2M4YdHLMdiUBR1J+LCybMTCSNXF2ZYYNteTVOImxaOs64i6PnIARxRynmzlx9q1INlm5bKc63vqT9j4C/NmWjb5HlV8eYNr6T3LUxiXzHwy79L7md+NS9m2WhmV3ra08YqLonfy4akccLB9i8jvxoEUvsaB81H/Um9TkfSeiSBqLZ5v6YY+6V3wj3/kHECyxoJtY06w37aL5OauhvNVfMJWu6XWQigOkGukPM2s8nvJJ61VKdAn2vMUHE7O130jkXD4HpP+0g2sZh97CWtMh0xfsg+x2FyXf2OXlucV0N1D+XAbx0Pw3JDmfUMH//BtovquTXCI51S1sa8dwANYd7dwsFkRN6Agn8QHRwJTra/K8yjcb4GQEuhCmKwzP5S+D8++D6XXIJ+8Bvn0KIaMgpCSgoTKlaMkb3gqMl61ZvrMKyCHafrcDRzw7YLaOSaQiKiemfNrskG+nRpp0gJbWfy3//j0g9R4FEtxpSG2ogfdIkTMYePsVk1BcBBqAt6xJ9YXJlA7KO7Ynq9BBWlVV5SZNE+fvKlsoYz5Gp9wEuLlfnIvyFp/VRqmP99ZlqwqnFrCoZy2Bncq1k98ofE37SPzPcR32yekziH5ROF0lSpNrc6WXjpm6pJuDd2vMKH8mxQrCuw0c0k/oJjCGVF5OwxP/WDhNq61+t5iYkIHO9QdFhWjssuocBVVdyOdSfJpfFD0Nq71PBuqRfbyg/Cx+tux8v8+/dDyVhE/NqV8PXnDcTZOO9MP2H9/Dw6qDZENlW/b7j7+uO5yv/3tb/t4o4AL1fNBUeaY+BaFg81GNdAKhy7F5HMcn2026sRaxN86B7jdp5bK4j7Txg7qyv+/5pbl4h1814Vjsa2kcWMxkuNtYXp1rrb31UFx6AlnPcDd0vUQEGQ5qUQqp9SznUX+I3LZlegtoy5uzBbaViskd6604HHigvxMqb2Lee+qzBt+tFpd57KMpHXo5PQ4vTZV7ObM0skX5Zeat08DgUPHoujotXy4xCFlDuPoNYTUIrQvnJ3WL/jTA6SknJB8RYW0AxgFTgts+Sl3I8kdkFOjttDIrP2kfzWanmfamN53svC27+FIFG387zuD0jC2CLwO/vRT4TEE/VF+el+aOHr+j3m2PFz+dnya4Iqy6E8rP+eeGXuS4dTNtxmnVunkXFjqOZtnK/82t9yarxW41caIJo9EDjv3hOJ3Igda8dqNIWlBtr51p/JtH8aOb/vAa0SI66DsQ+x9HMzdRZm6pN1b3HeoJF8gxLif/qva84XqaG+OzeSjDWaAWIjAMNibVELZF5hsamCp0tgWhb/9TR+9h7dvBUMci1ohjoiNzpLhiQqclYn+auV9Zosy2rOFzyC9uNJH7ztx5wX79T8BAAD//x+Jt1eKSQAA + H4sIAAAAAAAA/+R8e3PbOJL4//oUPQwntjMhaXsem593Nb9TZMajsi25KCm5u2yWRZGQxDVJaEFQdiLzu1+BT5AEJdnOzORunarIJoBGo9/daOrFd9rMDbSZFS47nX7fHOvG+0FfNwdDc3J909XwimrWl4ggzcYBtdwAkVCzbWVF8P1nNURk7dpIdYNk7ah/qU/2XYrtW0STlcOB2R8N3w0uzPOB0ZU0RG3NDlwtQFR1pGT87WCYDTKobHDmBunQ+ejD8GrUOx/XJjj4LvCw5YRSp28M+pOrYiY/kbg29QRzyw2jkGgeti0v23I0nPQGQ904F++cH9XhgRrTYV84nUSBzU+8fDMWzruNZogEiKKwPrvf6/+m75iprYi7tihSVpZ9ay1QKHWmb6fDydQ09Cu9N9a78qEXzkyCPGSFCBQCSnjUGev9qaGbk6ux+XY0mownRu/GvJy+1a/0ian/p943b66mF4xQTcKmjKdeOMOYhpRYK2l/eO91YzwYDbvS+lg9UY8Vy1stLfVU6kz0K/1mZEzOt+xMkYdWmNAKAxoL9+Hvh974OsdlnCDzo3oM62P1Z/WEfbxRj6XOdW84eKePJ+a7wZV+05v8ViGAbwXuHIVU/WeIg2Syef7W7E0nI3N6c96b6Oa7q94Fv3ZtEc1zZ2yl4sw0K6JYiVaORZHU6U+NK3M0ndxMJ12N+ivNjohnrhGZ4RCpOKKdDkE+XqNrKzif9SKKp8nKd561eOd66PAINh0AAOKDMgd5FzqduNOxCbLoToAUR/ZyT4AesoJo1S8U5dxjoMIKcmQOcpumMSBuEFLL8wogRhRQ1y/xcefwESR5M9T187FZQool6HZBoiRCEnz6K9AlCpIF7AfZSwySG0ALdFCASasx1Cf6OBcM6IK8aT6OpQJsIlxQGgbGsNDF5b4JssocJLkhTE0k2U8TVleSD//5L6a4ajmoImeBhFCPpAq8nFpVo5DR6uSNevyTGI9duBzwyKzcIECOKp28Of5JOtgHrblbssYLUWUs5dWHnjEcDC/OOCwgwwICTGGOo8ABN4BcD1+Dg+ZW5FE3WADFsLSIY2OH4dXhtu0ITreyqL3kz5iiIDcJIMED2BEFxVFAmZ9wp+LmErR2HwnplIOUysyX6qoKihJ8goeHhLHtUxiDg8jzxJNzHCvzBHKQK87a8lynPGTOijMQHa0K4d6lIOuGwemqORiOJ72rK3MyuNZH04mQQR5ehCbFJlqjgIYg9S7Han+sqy0qnD8fUytwLA8HqLRDEjtC6yjImzYyxtWxnGqcCdjDsnDnfq8buWFp3TKFXVGLDPY1nn3uZGQqLeUQ0TtMbm+8aOEGFTOZ2cnJh5FxmXlHpvkgJR5Mgk91jmcQe2y4Pxx0OFXNj5c9LSx5PUyDlwy13D/3h4MCI//WcQkoK8GiZJw9nVz8dxJhyhv2V4ry2JwaVy9evNJieAHTEAGLaGEWuUzV4UWKDqLks+075gJRk1pkZnkenJwew88gNbfTUvDZZrEEje1ipjKc5HIQCpnljjlGdkTQ5Gr8Ng+JLqMZ8hDV75FdY0zqM1bJQzMiXldaUroKzzTt9k2YhWmhOvPwTLUxQeqdGzj4LlQDRDXrNlSoFypF5KXYnosCqsmbx0Zgsea5QXSvWb7zy0+aCKjEyZF86IY94/qXn46YvThpSs63cx7ibz1PbmFKaXxSLNzhDp1LAdPjZVd6BO48xLgF6TLo+S6NJES7No13oRHu3JxbrhcRBD8yffjlGFhsCcp8fAUKbgVYPI+IJ1XVoUB774PW7by9xHcBKAYQjOkZ+w+kpzGC88BLHzsM5l9+/vl50FLzWtiwwlB/sEJ/vHT9MqCdYwLh0vVz480CErktz/grOLjAduYGFvksCDo2PLyYhQmUgArK0Zaw884K/aruWXao+C4hmKiJsWfxYqJy5SqFrVLYbqFW25W3Dbu2nbseSgW/nm/xAc0eJqQWRf1eZ2L2QRwR8krWdkp+LwZeCVduoDSYloVcjwbmuYslFYATkGovBV+nGv7Y01SFM1bWJ5IASkQ8MQA2/fTXlydMdhECmUtu4VfNQWuNBZzwAAuCVqDoIP3jkKF8pr46ejj8iPRPhKivjmQJXr6EQ9uiVRAvX3K26NKYjidMpev++egPoFbOrmfQKwXx70Kxu7vwWeRi679BWqWuJ/U7X0HXvgLsLZL5fOitXOTNKvtwcIB4V5onFk/MCd4P9Yn5BycGoj0fmR30k0p0ceasDJ1XQuWT9OnN1OwZ/d+68uEC0f7NtEfs5VGdSM1qNw+yeD41rvZxm8RVKMZeqK3lTRWrWEu466Iwq6MrzSlK4lAVeZOjHqvUIurii8TjlNBST1O6JpYJ96qMSgqfTPTgJLM2kujcWgEv3yHN45p7xHxVscaKdqLbESEooO+z+Ew+TOkAipKHeqcVYxMiBw5yahWVKk1bHBxV8/Eq4FiC77ogCXLxNBzMATXWAZ5DtpnlEWQ5n/MUHTkqhLfuauUGC6icm62hFlkgCiXcZoHze/VVrB4LyhB1lkpPlY2SIFmEtC+DhUFjXotoMJ9lVYJq1oogxbbsJXJyChYFxbMWykl11xiRAE7q5q7cYhqsLPuWgcl2cAOKSwyzKwqujEQtAl/u14+hhdJvAqwlWGV2JVcnZnLaabqBLROradEkv4yp1TcqRigzbuUdTWH1Th9TXUgJXsnf05XKF5A3FWVvU6QcbWChy8oilo8oIkkC13IiuLPCRDIW7hpx6Uxp+MtjFSjohlGpmpVYNmjQimpxzVUpeD8Di9KBbL1l222HN1vXx+UFHTMJzQOzKK/KLU04r4TDFR427WflLXybWD5d0vpTw9CHk1J0D0sG7fAGTU6uS4+QptOTnnGhl8Cl7O4xQzlE/hqRPvZXFkFM3au4nCnSsXqsHksxE7AKpFgoWpkT8ThnAU0kG/vE4IYsnLaYytClFcAhJoD+FVkeUHyUO5WZFSIOSA2hpleq8UoVuJw23dwmiokZaGxfgPTXX0mS226e95Lf/AYkEd+mGf7q4DNTUPjK7ednChUiGq36w8G5S8KWgD3DqAPikp5gDleiq4wKgJeNI1vhN6aVnqw6ykWBXAbynFuHJPAfGNzaDNL3Kl18idmUirNytuQcGRxRjOOvswuKyrq4tlB71aR39RKpEnDtTH2EodauO7nhQOWufiTg/hCW3FjYo9x/2Q8jFvDUT5gD2yV9JfMbOeizc8w9xAD+/WQhp7NaT/5LqajcM/6ZooHuKbFsehnN0Nss763d192+CblafVbpyIaiGTKzYkhSr5ZPpbo92zS6v+IacLr4YlJ/1ZU3NXiCFFlUy2hsoMkbDm6SHNcg18oYPITKhU3CCYUSKwjnmPhdKXxQXz28VNIN8vrPgwSKEi7xXTkTOUpg+ShkfExSm91I/r3gv6KElLgrxcb+CgdMxLo/Mj5XbxmAa4oLsIOSlsfb9PK1dSxPaNJeqT3Q4mTkJu23+9qi8ihByC5ikhTWXN0uulIqYEXDYNw4AG965kkZolgt0u8sWkyT5Ky1ECqLWESYpMyv4c71PIhCxCJDKojh9gBWJOBSLRLPkuxcl7PwpSoDOb+VV6IBm3rKq85uBapSZJey3BiD972JnijNzeVFkXF9PV2p4vOH6UXpKLMWhst0oBc47Lcbgu8/l65zOp6MrpNbVWZOe8Z/1WqQLJNoTJkaV2fdrPZR0HELCNEcHkYqX1HIMousHZZl+WcgXlrJE16DHYUU+/mCHSfKdswoZGYdZ6Y7N303ZAh0KYkQr23fpdn/LriCTPRZor6Hg27nryrwhxIIHor7I/c4bhmItFNybuVGBHkVWu5kapOYzyaFwOwXFBGMtRJmJ+6CIlcaprXwW9yhCp/SG+gti5kUtS6u94Vlxet2biV9hEz2xbHii8nofHQGaQszGwYbB45LXRyAvUT2LeAAavoNOLARGDdgL61ggZjDydqJnApsdw6Hh1n7hJjseaelpEpJryX82oWTvxwdwcuX8BGUgFnb2uYtl+5/slrVkazgxhWhs1/z8t/6sQLQMl3aBm6LMLZMlzpcxm79cN9i61os3bPiAdCW2Efa8vMKEfZQKV4oSPsXVxHXyTnwrUXZf96/GpiT0aiobRfdPubgunehp2XvU84xMVhJT/ISgeunsY9gUQypB5M3+Q5xpQOvfJy07NqUCBS1VTbZvgwRmxJVvL0EkujK/5djOGEx0jHYlIU2SZCysmzEglXVxdmRGGyu86mEm5Sost4m6vrIARxRyGmylR5r14LkmJUrea67qj9h8y/Mm2nZSnxU8RgNqqW3OU8hXLLyybRLb4F+Nyplx2olVHqn00YrLlbfSYenUsDB9i0ivxsFUvA1CpyP+pd6m4ikt1kEUWvxfE039Envgn/8I2cAkj0W7Bhzgv22UyT3gzU4X8UmbNVbai2E7AC5hsrT1Cq//XzSXpVrgER6ngKH4/N130g4HL7DpL90A6vZLV+CNaZDJi/ZqzI29y5B45SW5xWgu4fy4TaKh+C5Ic27kw7+4dtE9V2b4BDPqWpjXzuAB7DubuFgsyJuQEE+iQ+OBKpa35WnUbjfBiEl0IUw2Wd+KH0fnn0fSq9BPnkN8ulRDBkGISUFCpWLTUne8FhktGqtJzCrgBwm6XM3cMC3C2znmEDConr+z+/JJvl2qqRJo21l84//8ekHqfEoluJK221FDrpF1JiDjbO7OwXBQagJaMeeWF8YQ+2guMl7vgQVqFVNUabSPH7ypnKEMgRsvEclhJfbyb1A1rq40uj9+cayJFVh1BIK5bg1qFPRfuILlb+pH5ntIb7bviA1Dsl7i9NVKjS1al56tZmJS3o0dL/ChPIjKawosNOEJn0NMgVnROUdNDz19cVtVGu1vcXCBA/m1B0WFaOyl6kwFVVzI51J8ml8UHRQrvU8QapF9vKD8LH68Vj5f59+aBlVxI9NKd9P3nCUjdP+9wP27+/BQbXtsiHybcfdxx7XTe63f/xtL1EKqFD1D4oyx8S3KBxsNqqBVjh0KSaf4/hss1En1iL+1inAnT7VVBb3mTZ2UFf+/zWzLBdj8F0XjsW6ksaNxUyOtoXq1ana3r0HhdMTrnqAu6XrISDIclKOVLzUs41F/iMy2ZXoLcMubqwW6lYrSM6vtMDj2AW5T6mNxbx1VeYNO1qt4XNZRtKgdHJ6nF7OKnZzZWnki2pMzdqngcChY1F09Fo+XOKQMoNx9BpCahHaF65O6xe89wApKSckX4Qh7QCMAqcFbPkuvZHkDsipYVtIZNbk0r8aTc8zaUxvVVl42/dwJIo2/vf5oDSMLQKvgz/dKzwGoT/KTu+LE4fP/zHLlofL345NE1yEFl1w5dv0mbInGU5dfZtxahVPzoSllrPpW/nRXHNrtlZgVhszmjQSGezcEorHRAa0YrUbU9KCbP3oTuU7RYwd3ymC14gQ10HZq/J9HMzdRZm6pD1i3De1JF9TxKif/q/a84XqaG+OzeQFCjNALERgMNhIyqHsa1I2NWCp0NgWhb/9TR+9g19/FUxxLGqFOCI2OkumJyJwVib6q5X3mW3KcM82PoP0ekwfvevEnRfs438CAAD//yEZ8LDwSQAA - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXPbOJL3//oUPQwntjMhaXteNo93lecUmfGobEsuSkrubjbLokhI4poktCAoO5H53a/AV5AEJdnOzORuPVXxmAR+aPQbuhstvfhOm7mBNrPCZafT75tj3fgw6OvmYGhOrm+6Gl5RzfoSEaTZOKCWGyASaratrAi+/6yGiKxdG6lukMwd9S/1yb5TsX2LaDJzODD7o+H7wYV5PjC6koaordmBqwWIqo6UvH83GGYvGSp7OXOD9NX56OPwatQ7H9cGOPgu8LDlhFKnbwz6k6tiJD+QuDb1BGPLBaOQaB62LS9bcjSc9AZD3TgXr5xv1eFBjemwLxxOosDmB16+GQvH3UYzRAJEUVgf3e/1f9V3jNRWxF1bFCkry761FiiUOtN30+Fkahr6ld4b61350AtnJkEeskIECgElPOqM9f7U0M3J1dh8NxpNxhOjd2NeTt/pV/rE1P9T75s3V9MLxqgmY1PBUy+cYUxDSqyVtD/eB90YD0bDrrQ+Vk/UY8XyVktLPZU6E/1KvxkZk/MtK1PkoRUmtCKAxsR95PuxN77OaRknxPyoHsP6WP1ZPWG/3qjHUue6Nxy818cT8/3gSr/pTX6tMMC3AneOQqr+M8RBMtg8f2f2ppOROb0570108/1V74Kfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aVOZpObqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0bUVnM96EcXTZOZ7z1q8dz10eASbDgAA8UGZg7yLnE7c6dgEWXQnIMWRvdwT0ENWEK36haGcewwqrBBH5iC3WRoDcYOQWp5XgBhRQF2/pMedw28gyZuhrp+PzRIplqDbBYmSCEnw6a9AlyhIJrAfZC8xSG4ALeigANNWY6hP9HGuGNAFedN8HEsFbKJcUDoGJrDQxeW6CbHKHCS5oUxNItlPE6sryYf//BczXLV8qSJngYSoR1IFL+dW1SlkvDp5ox7/JKZjFy0HPDErNwiQo0onb45/kg72IWvulqLxQlR5l8rqY88YDoYXZxwVkFEBAaYwx1HggBtAboevwUFzK/KoGyyAYlhaxLGxw+jqcMt2BLtbWdRe8ntMSZCbDJDgAeyIguIooMxPuF1xYwlau49EOuWQUp35Up1VIVGCT/DwkAi2fQgTcBB5nnhwTmNlnEAPcsNZW57rlJvMRXEGoq1VEe5dCrJuGJytmoPheNK7ujIng2t9NJ0IBeThRWhSbKI1CmgIUu9yrPbHutpiwvnzMbUCx/JwgEo/JLEttL4FedPGxrj6Luca5wL28Czcvj/oRu5YWpdMsStmkWFf49nnTsam0lMOEb3D5PbGixZuUHGTmZ+cfBwZl9npyCwfpOQEk+BTXeIZYo+97g8HHc5U8+1lTwtPXg/T4CUjLT+f+8NBQZF/67gElJVgUvKePZ1c/HcSYcob9ldK8ticGlcvXrzSYngB0xABi2hhFrnM1OFFSg6i5LPtO+YCUZNaZGZ5HpycHsPPIDWX01L4bLFYgsZyMTMZTnM5hEJnuW2OkR0RNLkav8tDostohjxE9Xtk1wSTnhmr5KEZEa8rLSldhWeadvsmzMK0UJ15eKbamCD1zg0cfBeqAaKadRsq1AuVIvJSbM9FAdXkzWMjsFjz3CC61yzf+eUnTQQqcXokH7phz7j+5acj5i9Omprz7eyH+Fv3k3uYUhufFAt3uE3nWsDseNmVHkE7jxi3EF0GPd+lkYRo1abzLizCnZtzy/UiguBHZg+/HAOLLUGZj69Awa2AxfOIeFLVHAqy995o3c/bS3wXgGIAwZiesX9AepoguBN46WOHYf7l55+fh5a618KHFY76oxX646XrlwHtHBMIl66fO28WkMhtecZfwcEFtTM3sMhnQdCx4fFiFiZQAiooR1vCzjsr9Ku2Z9mh4ruEYKImzp7Fi4nJlbMUNkthq4VabVXeN+xadu56KFX8er7FBzR7uJBaFPV77Yn5B3FEyBtZ2y75tRi8Eq7cQGkILQu5Hg3muYslFcAJWLWXga9TC3/sbqrKGSvrE0mAEhFPDMCGn759ecJ0FyGQueQW3moOWmss4IQHWBC0AkUH6R+HjOQz9dXRw+FvSP9EiPrqSJbg5Us4tC1ahXj5kvNFl8Z0PGEmXT+fj/4AbuXiega/Uoh/F47d3YXPYheb/w3yKj160nPnK9jaV8DeopnPR2+VIu9W2S8HB4g/SvPE4ok5wYehPjH/4MRAtOYjs4N+Uoku9pyVofNKqHySPr2Zmj2j/2tXPlwg2r+Z9oi9PKozqVnt5iGL51Pjap9jk7gKxdgLtbW8qVIVa4l0XRRmdXSlOURJDlRF3uSkxyq1iLr4IvE0JbzU05SuSWUivaqgksInUz04ybyNJNq3VuDlK6R5XHONmK8q1kTRznQ7IgQF9EMWn8mHKR9AUfJQ77TibELkwEHOraJSpWmLg6NqPl4FjiX4rguSIBdPw8EcqDEP8ByyxSyPIMv5nKfoyFEhvHVXKzdYQGXfbA61yAJRKHGbBc7v1VexeiwoQ9RFKj1VN0qGZBHSvgIWBo15LaIhfJZVCapZK4IU27KXyMk5WBQUz1o4J9WPxogEcFJ3d+US02Bl2bcMJlvBDSguKcyuKLgyErUIfLlfP4YXSr8JWEuwyuxKrg7M9LTTPAa2DKymRZP8MqZW36g4ocy5lXc0hdc7fUx1IWV4JX9PZypfQN5UjL3NkHKygYUuK4tYPqKIJAlcy47gzgoTzVi4a8SlM6XjL7dVkKAbRqVqVlLZ4EErqcU1V6Xg/QwqygNk6y3bbj+82To/Li/omEtobphFeVVpacJxJQ5XeNi075X38G1q+XRN608NQx9OStU9LAW04zRoSnJdnghpOj3pGRd6CS5ld48ZySHy14j0sb+yCGLmXqXlTJGO1WP1WIqZglWQYqFqZYeIxx0W0CSysU4MbsjCaYuZDF1aARxiAuhfkeUBxUf5oTKzQsSB1Ahqnko1WamCI6fNNrepYuIGGssXkP76K2ly283zXvqb34Ak6tt0w18dPnMFxVm5ff/MoEJEo1V/ODh3SdgSsGcUdUBc0hOM4Up0lbcC8LJxZCt+Y1h5klXfclEgl4E859YhCfwHBjc3Q/pepYsvMRtSOaycLTlHhiOKcfx1dkFRmRfXJmqvmvyuXiJVAq6dqY8w1Np1JzccqNzVjwTcH8KSGwt7lPsv+1HEAp76DnOwXdpXCr+Rgz47x9xDDeDfTxdyPqv15L/Uiso945+pGuieEsuml9EMvcvy3tp93e2bkKvVZ5WO7FU0Q2ZWDEnq1fKpVPdnm0b3V1wDp4svJvVXXXlTwxOkyKJaRmMBTd5wuElyXEOulTF4hMqFTSIJhRIrCOeY+F0pfFBfPbxU0gXy+s+DBIoSLvFdORI5SmD5KGRyTFKb3UT+vZC/ooSUuCvFxv4KB0zFuj8yOVdvGYBriguwg5KWx9v08rX1XZ7QpL1Se5DF6chN2m/3tVXlUYqQXcQkKay5ul10pVTBiobBuLEB3vXMkzJEMVtk31m0mCbJWWshVCaxiDBJmV/Dnet5EIWIRYZUEMPtAVYk4FItEs+S7NyWs/ClqgO5vJVXohc29ZRXnd0GVOXILmO5MQYfehM9MZqby4si4/p6tlKl5w+zi/KgzFoYLtMXvcBh/3dD8P3n8uicjiej6+RWlbnTnvFftRokyyQaQ6bG1Vk3q30UfNwCIRrDY6T6FYUss8jaYVmWfwbiqZU84TXYUUixn0/YsaNsxYxDZtZxZrpz03dDRkCXkgjx1vZdmv3vwhVkos9S9T0O6Hb5qoLzUALBQ3F/5B7bLQORdk7OrdyJIK/Cy51CbTLz2awQuP2CI4J3rYzZSbugyJWGaS3yFneowqdP8PJlWnFuZ3HS/McUtsmwF5PR+egM0p5j9gpsHDguZZm9vUT2LeAAagYJOLARGDdgL61ggdgJkfX/OHzgeXiY9TqIeZS3RUqqlDRGwtsunPzl6CjZDygBc421hVtuyP9E/a8TWK8U54W5tVCuzMBb5NoyXNoGt0VNWoZLHS6Xtn64b/FCLT7oWSc1aEvsI235eYUIe6gUrf5pZ+Eq4nosB761KDvD+1cDczIaFVXnog/HHFz3LvS0IH3KHRkMK+kWXiJw/TQqEUyKIT1b5E2+QlzpjSsfJ820NiWCiKpVGdm6jBCbElW8vASS6DL+l2M4YdHLMdiUBR1J+LCybMTCSNXF2ZYYNteTVOImxaOs64i6PnIARxRynmzlx9q1INlm5bKc63vqT9j4C/NmWjb5HlV8eYNr6T3LUxiXzHwy79L7md+NS9m2WhmV3ra08YqLonfy4akccLB9i8jvxoEUvsaB81H/Um9TkfSeiSBqLZ5v6YY+6V3wj3/kHECyxoJtY06w37aL5OauhvNVfMJWu6XWQigOkGukPM2s8nvJJ61VKdAn2vMUHE7O130jkXD4HpP+0g2sZh97CWtMh0xfsg+x2FyXf2OXlucV0N1D+XAbx0Pw3JDmfUMH//BtovquTXCI51S1sa8dwANYd7dwsFkRN6Agn8QHRwJTra/K8yjcb4GQEuhCmKwzP5S+D8++D6XXIJ+8Bvn0KIaMgpCSgoTKlaMkb3gqMl61ZvrMKyCHafrcDRzw7YLaOSaQiKiemfNrskG+nRpp0gJbWfy3//j0g9R4FEtxpSG2ogfdIkTMYePsVk1BcBBqAt6xJ9YXJlA7KO7Ynq9BBWlVV5SZNE+fvKlsoYz5Gp9wEuLlfnIvyFp/VRqmP99ZlqwqnFrCoZy2Bncq1k98ofE37SPzPcR32yekziH5ROF0lSpNrc6WXjpm6pJuDd2vMKH8mxQrCuw0c0k/oJjCGVF5OwxP/WDhNq61+t5iYkIHO9QdFhWjssuocBVVdyOdSfJpfFD0Nq71PBuqRfbyg/Cx+tux8v8+/dDyVhE/NqV8PXnDcTZOO9MP2H9/Dw6qDZENlW/b7j7+uO5yv/3tb/t4o4AL1fNBUeaY+BaFg81GNdAKhy7F5HMcn2026sRaxN86B7jdp5bK4j7Txg7qyv+/5pbl4h1814Vjsa2kcWMxkuNtYXp1rrb31UFx6AlnPcDd0vUQEGQ5qUQqp9SznUX+I3LZlegtoy5uzBbaViskd6604HHigvxMqb2Lee+qzBt+tFpd57KMpHXo5PQ4vTZV7ObM0skX5Zeat08DgUPHoujotXy4xCFlDuPoNYTUIrQvnJ3WL/jTA6SknJB8RYW0AxgFTgts+Sl3I8kdkFOjttDIrP2kfzWanmfamN53svC27+FIFG387zuD0jC2CLwO/vRT4TEE/VF+el+aOHr+j3m2PFz+dnya4Iqy6E8rP+eeGXuS4dTNtxmnVunkXFjqOZtnK/82t9yarxW41caIJo9EDjv3hOJ3Igda8dqNIWlBtr51p/JtH8aOb/vAa0SI66DsQ+x9HMzdRZm6pN1b3HeoJF8gxLif/qva84XqaG+OzeSjDWaAWIjAMNibVELZF5hsamCp0tgWhb/9TR+9h7dvBUMci1ohjoiNzpLhiQqclYn+auV9Zosy2rOFzyC9uNJH7ztx5wX79T8BAAD//x+Jt1eKSQAA + H4sIAAAAAAAA/+R8e3PbOJL4//oUPQwntjMhaXsem593Nb9TZMajsi25KCm5u2yWRZGQxDVJaEFQdiLzu1+BT5AEJdnOzORunarIJoBGo9/daOrFd9rMDbSZFS47nX7fHOvG+0FfNwdDc3J909XwimrWl4ggzcYBtdwAkVCzbWVF8P1nNURk7dpIdYNk7ah/qU/2XYrtW0STlcOB2R8N3w0uzPOB0ZU0RG3NDlwtQFR1pGT87WCYDTKobHDmBunQ+ejD8GrUOx/XJjj4LvCw5YRSp28M+pOrYiY/kbg29QRzyw2jkGgeti0v23I0nPQGQ904F++cH9XhgRrTYV84nUSBzU+8fDMWzruNZogEiKKwPrvf6/+m75iprYi7tihSVpZ9ay1QKHWmb6fDydQ09Cu9N9a78qEXzkyCPGSFCBQCSnjUGev9qaGbk6ux+XY0mownRu/GvJy+1a/0ian/p943b66mF4xQTcKmjKdeOMOYhpRYK2l/eO91YzwYDbvS+lg9UY8Vy1stLfVU6kz0K/1mZEzOt+xMkYdWmNAKAxoL9+Hvh974OsdlnCDzo3oM62P1Z/WEfbxRj6XOdW84eKePJ+a7wZV+05v8ViGAbwXuHIVU/WeIg2Syef7W7E0nI3N6c96b6Oa7q94Fv3ZtEc1zZ2yl4sw0K6JYiVaORZHU6U+NK3M0ndxMJ12N+ivNjohnrhGZ4RCpOKKdDkE+XqNrKzif9SKKp8nKd561eOd66PAINh0AAOKDMgd5FzqduNOxCbLoToAUR/ZyT4AesoJo1S8U5dxjoMIKcmQOcpumMSBuEFLL8wogRhRQ1y/xcefwESR5M9T187FZQool6HZBoiRCEnz6K9AlCpIF7AfZSwySG0ALdFCASasx1Cf6OBcM6IK8aT6OpQJsIlxQGgbGsNDF5b4JssocJLkhTE0k2U8TVleSD//5L6a4ajmoImeBhFCPpAq8nFpVo5DR6uSNevyTGI9duBzwyKzcIECOKp28Of5JOtgHrblbssYLUWUs5dWHnjEcDC/OOCwgwwICTGGOo8ABN4BcD1+Dg+ZW5FE3WADFsLSIY2OH4dXhtu0ITreyqL3kz5iiIDcJIMED2BEFxVFAmZ9wp+LmErR2HwnplIOUysyX6qoKihJ8goeHhLHtUxiDg8jzxJNzHCvzBHKQK87a8lynPGTOijMQHa0K4d6lIOuGwemqORiOJ72rK3MyuNZH04mQQR5ehCbFJlqjgIYg9S7Han+sqy0qnD8fUytwLA8HqLRDEjtC6yjImzYyxtWxnGqcCdjDsnDnfq8buWFp3TKFXVGLDPY1nn3uZGQqLeUQ0TtMbm+8aOEGFTOZ2cnJh5FxmXlHpvkgJR5Mgk91jmcQe2y4Pxx0OFXNj5c9LSx5PUyDlwy13D/3h4MCI//WcQkoK8GiZJw9nVz8dxJhyhv2V4ry2JwaVy9evNJieAHTEAGLaGEWuUzV4UWKDqLks+075gJRk1pkZnkenJwew88gNbfTUvDZZrEEje1ipjKc5HIQCpnljjlGdkTQ5Gr8Ng+JLqMZ8hDV75FdY0zqM1bJQzMiXldaUroKzzTt9k2YhWmhOvPwTLUxQeqdGzj4LlQDRDXrNlSoFypF5KXYnosCqsmbx0Zgsea5QXSvWb7zy0+aCKjEyZF86IY94/qXn46YvThpSs63cx7ibz1PbmFKaXxSLNzhDp1LAdPjZVd6BO48xLgF6TLo+S6NJES7No13oRHu3JxbrhcRBD8yffjlGFhsCcp8fAUKbgVYPI+IJ1XVoUB774PW7by9xHcBKAYQjOkZ+w+kpzGC88BLHzsM5l9+/vl50FLzWtiwwlB/sEJ/vHT9MqCdYwLh0vVz480CErktz/grOLjAduYGFvksCDo2PLyYhQmUgArK0Zaw884K/aruWXao+C4hmKiJsWfxYqJy5SqFrVLYbqFW25W3Dbu2nbseSgW/nm/xAc0eJqQWRf1eZ2L2QRwR8krWdkp+LwZeCVduoDSYloVcjwbmuYslFYATkGovBV+nGv7Y01SFM1bWJ5IASkQ8MQA2/fTXlydMdhECmUtu4VfNQWuNBZzwAAuCVqDoIP3jkKF8pr46ejj8iPRPhKivjmQJXr6EQ9uiVRAvX3K26NKYjidMpev++egPoFbOrmfQKwXx70Kxu7vwWeRi679BWqWuJ/U7X0HXvgLsLZL5fOitXOTNKvtwcIB4V5onFk/MCd4P9Yn5BycGoj0fmR30k0p0ceasDJ1XQuWT9OnN1OwZ/d+68uEC0f7NtEfs5VGdSM1qNw+yeD41rvZxm8RVKMZeqK3lTRWrWEu466Iwq6MrzSlK4lAVeZOjHqvUIurii8TjlNBST1O6JpYJ96qMSgqfTPTgJLM2kujcWgEv3yHN45p7xHxVscaKdqLbESEooO+z+Ew+TOkAipKHeqcVYxMiBw5yahWVKk1bHBxV8/Eq4FiC77ogCXLxNBzMATXWAZ5DtpnlEWQ5n/MUHTkqhLfuauUGC6icm62hFlkgCiXcZoHze/VVrB4LyhB1lkpPlY2SIFmEtC+DhUFjXotoMJ9lVYJq1oogxbbsJXJyChYFxbMWykl11xiRAE7q5q7cYhqsLPuWgcl2cAOKSwyzKwqujEQtAl/u14+hhdJvAqwlWGV2JVcnZnLaabqBLROradEkv4yp1TcqRigzbuUdTWH1Th9TXUgJXsnf05XKF5A3FWVvU6QcbWChy8oilo8oIkkC13IiuLPCRDIW7hpx6Uxp+MtjFSjohlGpmpVYNmjQimpxzVUpeD8Di9KBbL1l222HN1vXx+UFHTMJzQOzKK/KLU04r4TDFR427WflLXybWD5d0vpTw9CHk1J0D0sG7fAGTU6uS4+QptOTnnGhl8Cl7O4xQzlE/hqRPvZXFkFM3au4nCnSsXqsHksxE7AKpFgoWpkT8ThnAU0kG/vE4IYsnLaYytClFcAhJoD+FVkeUHyUO5WZFSIOSA2hpleq8UoVuJw23dwmiokZaGxfgPTXX0mS226e95Lf/AYkEd+mGf7q4DNTUPjK7ednChUiGq36w8G5S8KWgD3DqAPikp5gDleiq4wKgJeNI1vhN6aVnqw6ykWBXAbynFuHJPAfGNzaDNL3Kl18idmUirNytuQcGRxRjOOvswuKyrq4tlB71aR39RKpEnDtTH2EodauO7nhQOWufiTg/hCW3FjYo9x/2Q8jFvDUT5gD2yV9JfMbOeizc8w9xAD+/WQhp7NaT/5LqajcM/6ZooHuKbFsehnN0Nss763d192+CblafVbpyIaiGTKzYkhSr5ZPpbo92zS6v+IacLr4YlJ/1ZU3NXiCFFlUy2hsoMkbDm6SHNcg18oYPITKhU3CCYUSKwjnmPhdKXxQXz28VNIN8vrPgwSKEi7xXTkTOUpg+ShkfExSm91I/r3gv6KElLgrxcb+CgdMxLo/Mj5XbxmAa4oLsIOSlsfb9PK1dSxPaNJeqT3Q4mTkJu23+9qi8ihByC5ikhTWXN0uulIqYEXDYNw4AG965kkZolgt0u8sWkyT5Ky1ECqLWESYpMyv4c71PIhCxCJDKojh9gBWJOBSLRLPkuxcl7PwpSoDOb+VV6IBm3rKq85uBapSZJey3BiD972JnijNzeVFkXF9PV2p4vOH6UXpKLMWhst0oBc47Lcbgu8/l65zOp6MrpNbVWZOe8Z/1WqQLJNoTJkaV2fdrPZR0HELCNEcHkYqX1HIMousHZZl+WcgXlrJE16DHYUU+/mCHSfKdswoZGYdZ6Y7N303ZAh0KYkQr23fpdn/LriCTPRZor6Hg27nryrwhxIIHor7I/c4bhmItFNybuVGBHkVWu5kapOYzyaFwOwXFBGMtRJmJ+6CIlcaprXwW9yhCp/SG+gti5kUtS6u94Vlxet2biV9hEz2xbHii8nofHQGaQszGwYbB45LXRyAvUT2LeAAavoNOLARGDdgL61ggZjDydqJnApsdw6Hh1n7hJjseaelpEpJryX82oWTvxwdwcuX8BGUgFnb2uYtl+5/slrVkazgxhWhs1/z8t/6sQLQMl3aBm6LMLZMlzpcxm79cN9i61os3bPiAdCW2Efa8vMKEfZQKV4oSPsXVxHXyTnwrUXZf96/GpiT0aiobRfdPubgunehp2XvU84xMVhJT/ISgeunsY9gUQypB5M3+Q5xpQOvfJy07NqUCBS1VTbZvgwRmxJVvL0EkujK/5djOGEx0jHYlIU2SZCysmzEglXVxdmRGGyu86mEm5Sost4m6vrIARxRyGmylR5r14LkmJUrea67qj9h8y/Mm2nZSnxU8RgNqqW3OU8hXLLyybRLb4F+Nyplx2olVHqn00YrLlbfSYenUsDB9i0ivxsFUvA1CpyP+pd6m4ikt1kEUWvxfE039Envgn/8I2cAkj0W7Bhzgv22UyT3gzU4X8UmbNVbai2E7AC5hsrT1Cq//XzSXpVrgER6ngKH4/N130g4HL7DpL90A6vZLV+CNaZDJi/ZqzI29y5B45SW5xWgu4fy4TaKh+C5Ic27kw7+4dtE9V2b4BDPqWpjXzuAB7DubuFgsyJuQEE+iQ+OBKpa35WnUbjfBiEl0IUw2Wd+KH0fnn0fSq9BPnkN8ulRDBkGISUFCpWLTUne8FhktGqtJzCrgBwm6XM3cMC3C2znmEDConr+z+/JJvl2qqRJo21l84//8ekHqfEoluJK221FDrpF1JiDjbO7OwXBQagJaMeeWF8YQ+2guMl7vgQVqFVNUabSPH7ypnKEMgRsvEclhJfbyb1A1rq40uj9+cayJFVh1BIK5bg1qFPRfuILlb+pH5ntIb7bviA1Dsl7i9NVKjS1al56tZmJS3o0dL/ChPIjKawosNOEJn0NMgVnROUdNDz19cVtVGu1vcXCBA/m1B0WFaOyl6kwFVVzI51J8ml8UHRQrvU8QapF9vKD8LH68Vj5f59+aBlVxI9NKd9P3nCUjdP+9wP27+/BQbXtsiHybcfdxx7XTe63f/xtL1EKqFD1D4oyx8S3KBxsNqqBVjh0KSaf4/hss1En1iL+1inAnT7VVBb3mTZ2UFf+/zWzLBdj8F0XjsW6ksaNxUyOtoXq1ana3r0HhdMTrnqAu6XrISDIclKOVLzUs41F/iMy2ZXoLcMubqwW6lYrSM6vtMDj2AW5T6mNxbx1VeYNO1qt4XNZRtKgdHJ6nF7OKnZzZWnki2pMzdqngcChY1F09Fo+XOKQMoNx9BpCahHaF65O6xe89wApKSckX4Qh7QCMAqcFbPkuvZHkDsipYVtIZNbk0r8aTc8zaUxvVVl42/dwJIo2/vf5oDSMLQKvgz/dKzwGoT/KTu+LE4fP/zHLlofL345NE1yEFl1w5dv0mbInGU5dfZtxahVPzoSllrPpW/nRXHNrtlZgVhszmjQSGezcEorHRAa0YrUbU9KCbP3oTuU7RYwd3ymC14gQ10HZq/J9HMzdRZm6pD1i3De1JF9TxKif/q/a84XqaG+OzeQFCjNALERgMNhIyqHsa1I2NWCp0NgWhb/9TR+9g19/FUxxLGqFOCI2OkumJyJwVib6q5X3mW3KcM82PoP0ekwfvevEnRfs438CAAD//yEZ8LDwSQAA - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXPbOJL3//oUPQwntjMhaXteNo93lecUmfGobEsuSkrubjbLokhI4poktCAoO5H53a/AV5AEJdnOzORuPVXxmAR+aPQbuhstvfhOm7mBNrPCZafT75tj3fgw6OvmYGhOrm+6Gl5RzfoSEaTZOKCWGyASaratrAi+/6yGiKxdG6lukMwd9S/1yb5TsX2LaDJzODD7o+H7wYV5PjC6koaordmBqwWIqo6UvH83GGYvGSp7OXOD9NX56OPwatQ7H9cGOPgu8LDlhFKnbwz6k6tiJD+QuDb1BGPLBaOQaB62LS9bcjSc9AZD3TgXr5xv1eFBjemwLxxOosDmB16+GQvH3UYzRAJEUVgf3e/1f9V3jNRWxF1bFCkry761FiiUOtN30+Fkahr6ld4b61350AtnJkEeskIECgElPOqM9f7U0M3J1dh8NxpNxhOjd2NeTt/pV/rE1P9T75s3V9MLxqgmY1PBUy+cYUxDSqyVtD/eB90YD0bDrrQ+Vk/UY8XyVktLPZU6E/1KvxkZk/MtK1PkoRUmtCKAxsR95PuxN77OaRknxPyoHsP6WP1ZPWG/3qjHUue6Nxy818cT8/3gSr/pTX6tMMC3AneOQqr+M8RBMtg8f2f2ppOROb0570108/1V74Kfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aVOZpObqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0bUVnM96EcXTZOZ7z1q8dz10eASbDgAA8UGZg7yLnE7c6dgEWXQnIMWRvdwT0ENWEK36haGcewwqrBBH5iC3WRoDcYOQWp5XgBhRQF2/pMedw28gyZuhrp+PzRIplqDbBYmSCEnw6a9AlyhIJrAfZC8xSG4ALeigANNWY6hP9HGuGNAFedN8HEsFbKJcUDoGJrDQxeW6CbHKHCS5oUxNItlPE6sryYf//BczXLV8qSJngYSoR1IFL+dW1SlkvDp5ox7/JKZjFy0HPDErNwiQo0onb45/kg72IWvulqLxQlR5l8rqY88YDoYXZxwVkFEBAaYwx1HggBtAboevwUFzK/KoGyyAYlhaxLGxw+jqcMt2BLtbWdRe8ntMSZCbDJDgAeyIguIooMxPuF1xYwlau49EOuWQUp35Up1VIVGCT/DwkAi2fQgTcBB5nnhwTmNlnEAPcsNZW57rlJvMRXEGoq1VEe5dCrJuGJytmoPheNK7ujIng2t9NJ0IBeThRWhSbKI1CmgIUu9yrPbHutpiwvnzMbUCx/JwgEo/JLEttL4FedPGxrj6Luca5wL28Czcvj/oRu5YWpdMsStmkWFf49nnTsam0lMOEb3D5PbGixZuUHGTmZ+cfBwZl9npyCwfpOQEk+BTXeIZYo+97g8HHc5U8+1lTwtPXg/T4CUjLT+f+8NBQZF/67gElJVgUvKePZ1c/HcSYcob9ldK8ticGlcvXrzSYngB0xABi2hhFrnM1OFFSg6i5LPtO+YCUZNaZGZ5HpycHsPPIDWX01L4bLFYgsZyMTMZTnM5hEJnuW2OkR0RNLkav8tDostohjxE9Xtk1wSTnhmr5KEZEa8rLSldhWeadvsmzMK0UJ15eKbamCD1zg0cfBeqAaKadRsq1AuVIvJSbM9FAdXkzWMjsFjz3CC61yzf+eUnTQQqcXokH7phz7j+5acj5i9Omprz7eyH+Fv3k3uYUhufFAt3uE3nWsDseNmVHkE7jxi3EF0GPd+lkYRo1abzLizCnZtzy/UiguBHZg+/HAOLLUGZj69Awa2AxfOIeFLVHAqy995o3c/bS3wXgGIAwZiesX9AepoguBN46WOHYf7l55+fh5a618KHFY76oxX646XrlwHtHBMIl66fO28WkMhtecZfwcEFtTM3sMhnQdCx4fFiFiZQAiooR1vCzjsr9Ku2Z9mh4ruEYKImzp7Fi4nJlbMUNkthq4VabVXeN+xadu56KFX8er7FBzR7uJBaFPV77Yn5B3FEyBtZ2y75tRi8Eq7cQGkILQu5Hg3muYslFcAJWLWXga9TC3/sbqrKGSvrE0mAEhFPDMCGn759ecJ0FyGQueQW3moOWmss4IQHWBC0AkUH6R+HjOQz9dXRw+FvSP9EiPrqSJbg5Us4tC1ahXj5kvNFl8Z0PGEmXT+fj/4AbuXiega/Uoh/F47d3YXPYheb/w3yKj160nPnK9jaV8DeopnPR2+VIu9W2S8HB4g/SvPE4ok5wYehPjH/4MRAtOYjs4N+Uoku9pyVofNKqHySPr2Zmj2j/2tXPlwg2r+Z9oi9PKozqVnt5iGL51Pjap9jk7gKxdgLtbW8qVIVa4l0XRRmdXSlOURJDlRF3uSkxyq1iLr4IvE0JbzU05SuSWUivaqgksInUz04ybyNJNq3VuDlK6R5XHONmK8q1kTRznQ7IgQF9EMWn8mHKR9AUfJQ77TibELkwEHOraJSpWmLg6NqPl4FjiX4rguSIBdPw8EcqDEP8ByyxSyPIMv5nKfoyFEhvHVXKzdYQGXfbA61yAJRKHGbBc7v1VexeiwoQ9RFKj1VN0qGZBHSvgIWBo15LaIhfJZVCapZK4IU27KXyMk5WBQUz1o4J9WPxogEcFJ3d+US02Bl2bcMJlvBDSguKcyuKLgyErUIfLlfP4YXSr8JWEuwyuxKrg7M9LTTPAa2DKymRZP8MqZW36g4ocy5lXc0hdc7fUx1IWV4JX9PZypfQN5UjL3NkHKygYUuK4tYPqKIJAlcy47gzgoTzVi4a8SlM6XjL7dVkKAbRqVqVlLZ4EErqcU1V6Xg/QwqygNk6y3bbj+82To/Li/omEtobphFeVVpacJxJQ5XeNi075X38G1q+XRN608NQx9OStU9LAW04zRoSnJdnghpOj3pGRd6CS5ld48ZySHy14j0sb+yCGLmXqXlTJGO1WP1WIqZglWQYqFqZYeIxx0W0CSysU4MbsjCaYuZDF1aARxiAuhfkeUBxUf5oTKzQsSB1Ahqnko1WamCI6fNNrepYuIGGssXkP76K2ly283zXvqb34Ak6tt0w18dPnMFxVm5ff/MoEJEo1V/ODh3SdgSsGcUdUBc0hOM4Up0lbcC8LJxZCt+Y1h5klXfclEgl4E859YhCfwHBjc3Q/pepYsvMRtSOaycLTlHhiOKcfx1dkFRmRfXJmqvmvyuXiJVAq6dqY8w1Np1JzccqNzVjwTcH8KSGwt7lPsv+1HEAp76DnOwXdpXCr+Rgz47x9xDDeDfTxdyPqv15L/Uiso945+pGuieEsuml9EMvcvy3tp93e2bkKvVZ5WO7FU0Q2ZWDEnq1fKpVPdnm0b3V1wDp4svJvVXXXlTwxOkyKJaRmMBTd5wuElyXEOulTF4hMqFTSIJhRIrCOeY+F0pfFBfPbxU0gXy+s+DBIoSLvFdORI5SmD5KGRyTFKb3UT+vZC/ooSUuCvFxv4KB0zFuj8yOVdvGYBriguwg5KWx9v08rX1XZ7QpL1Se5DF6chN2m/3tVXlUYqQXcQkKay5ul10pVTBiobBuLEB3vXMkzJEMVtk31m0mCbJWWshVCaxiDBJmV/Dnet5EIWIRYZUEMPtAVYk4FItEs+S7NyWs/ClqgO5vJVXohc29ZRXnd0GVOXILmO5MQYfehM9MZqby4si4/p6tlKl5w+zi/KgzFoYLtMXvcBh/3dD8P3n8uicjiej6+RWlbnTnvFftRokyyQaQ6bG1Vk3q30UfNwCIRrDY6T6FYUss8jaYVmWfwbiqZU84TXYUUixn0/YsaNsxYxDZtZxZrpz03dDRkCXkgjx1vZdmv3vwhVkos9S9T0O6Hb5qoLzUALBQ3F/5B7bLQORdk7OrdyJIK/Cy51CbTLz2awQuP2CI4J3rYzZSbugyJWGaS3yFneowqdP8PJlWnFuZ3HS/McUtsmwF5PR+egM0p5j9gpsHDguZZm9vUT2LeAAagYJOLARGDdgL61ggdgJkfX/OHzgeXiY9TqIeZS3RUqqlDRGwtsunPzl6CjZDygBc421hVtuyP9E/a8TWK8U54W5tVCuzMBb5NoyXNoGt0VNWoZLHS6Xtn64b/FCLT7oWSc1aEvsI235eYUIe6gUrf5pZ+Eq4nosB761KDvD+1cDczIaFVXnog/HHFz3LvS0IH3KHRkMK+kWXiJw/TQqEUyKIT1b5E2+QlzpjSsfJ820NiWCiKpVGdm6jBCbElW8vASS6DL+l2M4YdHLMdiUBR1J+LCybMTCSNXF2ZYYNteTVOImxaOs64i6PnIARxRynmzlx9q1INlm5bKc63vqT9j4C/NmWjb5HlV8eYNr6T3LUxiXzHwy79L7md+NS9m2WhmV3ra08YqLonfy4akccLB9i8jvxoEUvsaB81H/Um9TkfSeiSBqLZ5v6YY+6V3wj3/kHECyxoJtY06w37aL5OauhvNVfMJWu6XWQigOkGukPM2s8nvJJ61VKdAn2vMUHE7O130jkXD4HpP+0g2sZh97CWtMh0xfsg+x2FyXf2OXlucV0N1D+XAbx0Pw3JDmfUMH//BtovquTXCI51S1sa8dwANYd7dwsFkRN6Agn8QHRwJTra/K8yjcb4GQEuhCmKwzP5S+D8++D6XXIJ+8Bvn0KIaMgpCSgoTKlaMkb3gqMl61ZvrMKyCHafrcDRzw7YLaOSaQiKiemfNrskG+nRpp0gJbWfy3//j0g9R4FEtxpSG2ogfdIkTMYePsVk1BcBBqAt6xJ9YXJlA7KO7Ynq9BBWlVV5SZNE+fvKlsoYz5Gp9wEuLlfnIvyFp/VRqmP99ZlqwqnFrCoZy2Bncq1k98ofE37SPzPcR32yekziH5ROF0lSpNrc6WXjpm6pJuDd2vMKH8mxQrCuw0c0k/oJjCGVF5OwxP/WDhNq61+t5iYkIHO9QdFhWjssuocBVVdyOdSfJpfFD0Nq71PBuqRfbyg/Cx+tux8v8+/dDyVhE/NqV8PXnDcTZOO9MP2H9/Dw6qDZENlW/b7j7+uO5yv/3tb/t4o4AL1fNBUeaY+BaFg81GNdAKhy7F5HMcn2026sRaxN86B7jdp5bK4j7Txg7qyv+/5pbl4h1814Vjsa2kcWMxkuNtYXp1rrb31UFx6AlnPcDd0vUQEGQ5qUQqp9SznUX+I3LZlegtoy5uzBbaViskd6604HHigvxMqb2Lee+qzBt+tFpd57KMpHXo5PQ4vTZV7ObM0skX5Zeat08DgUPHoujotXy4xCFlDuPoNYTUIrQvnJ3WL/jTA6SknJB8RYW0AxgFTgts+Sl3I8kdkFOjttDIrP2kfzWanmfamN53svC27+FIFG387zuD0jC2CLwO/vRT4TEE/VF+el+aOHr+j3m2PFz+dnya4Iqy6E8rP+eeGXuS4dTNtxmnVunkXFjqOZtnK/82t9yarxW41caIJo9EDjv3hOJ3Igda8dqNIWlBtr51p/JtH8aOb/vAa0SI66DsQ+x9HMzdRZm6pN1b3HeoJF8gxLif/qva84XqaG+OzeSjDWaAWIjAMNibVELZF5hsamCp0tgWhb/9TR+9h7dvBUMci1ohjoiNzpLhiQqclYn+auV9Zosy2rOFzyC9uNJH7ztx5wX79T8BAAD//x+Jt1eKSQAA + H4sIAAAAAAAA/+R8e3PbOJL4//oUPQwntjMhaXsem593Nb9TZMajsi25KCm5u2yWRZGQxDVJaEFQdiLzu1+BT5AEJdnOzORunarIJoBGo9/daOrFd9rMDbSZFS47nX7fHOvG+0FfNwdDc3J909XwimrWl4ggzcYBtdwAkVCzbWVF8P1nNURk7dpIdYNk7ah/qU/2XYrtW0STlcOB2R8N3w0uzPOB0ZU0RG3NDlwtQFR1pGT87WCYDTKobHDmBunQ+ejD8GrUOx/XJjj4LvCw5YRSp28M+pOrYiY/kbg29QRzyw2jkGgeti0v23I0nPQGQ904F++cH9XhgRrTYV84nUSBzU+8fDMWzruNZogEiKKwPrvf6/+m75iprYi7tihSVpZ9ay1QKHWmb6fDydQ09Cu9N9a78qEXzkyCPGSFCBQCSnjUGev9qaGbk6ux+XY0mownRu/GvJy+1a/0ian/p943b66mF4xQTcKmjKdeOMOYhpRYK2l/eO91YzwYDbvS+lg9UY8Vy1stLfVU6kz0K/1mZEzOt+xMkYdWmNAKAxoL9+Hvh974OsdlnCDzo3oM62P1Z/WEfbxRj6XOdW84eKePJ+a7wZV+05v8ViGAbwXuHIVU/WeIg2Syef7W7E0nI3N6c96b6Oa7q94Fv3ZtEc1zZ2yl4sw0K6JYiVaORZHU6U+NK3M0ndxMJ12N+ivNjohnrhGZ4RCpOKKdDkE+XqNrKzif9SKKp8nKd561eOd66PAINh0AAOKDMgd5FzqduNOxCbLoToAUR/ZyT4AesoJo1S8U5dxjoMIKcmQOcpumMSBuEFLL8wogRhRQ1y/xcefwESR5M9T187FZQool6HZBoiRCEnz6K9AlCpIF7AfZSwySG0ALdFCASasx1Cf6OBcM6IK8aT6OpQJsIlxQGgbGsNDF5b4JssocJLkhTE0k2U8TVleSD//5L6a4ajmoImeBhFCPpAq8nFpVo5DR6uSNevyTGI9duBzwyKzcIECOKp28Of5JOtgHrblbssYLUWUs5dWHnjEcDC/OOCwgwwICTGGOo8ABN4BcD1+Dg+ZW5FE3WADFsLSIY2OH4dXhtu0ITreyqL3kz5iiIDcJIMED2BEFxVFAmZ9wp+LmErR2HwnplIOUysyX6qoKihJ8goeHhLHtUxiDg8jzxJNzHCvzBHKQK87a8lynPGTOijMQHa0K4d6lIOuGwemqORiOJ72rK3MyuNZH04mQQR5ehCbFJlqjgIYg9S7Han+sqy0qnD8fUytwLA8HqLRDEjtC6yjImzYyxtWxnGqcCdjDsnDnfq8buWFp3TKFXVGLDPY1nn3uZGQqLeUQ0TtMbm+8aOEGFTOZ2cnJh5FxmXlHpvkgJR5Mgk91jmcQe2y4Pxx0OFXNj5c9LSx5PUyDlwy13D/3h4MCI//WcQkoK8GiZJw9nVz8dxJhyhv2V4ry2JwaVy9evNJieAHTEAGLaGEWuUzV4UWKDqLks+075gJRk1pkZnkenJwew88gNbfTUvDZZrEEje1ipjKc5HIQCpnljjlGdkTQ5Gr8Ng+JLqMZ8hDV75FdY0zqM1bJQzMiXldaUroKzzTt9k2YhWmhOvPwTLUxQeqdGzj4LlQDRDXrNlSoFypF5KXYnosCqsmbx0Zgsea5QXSvWb7zy0+aCKjEyZF86IY94/qXn46YvThpSs63cx7ibz1PbmFKaXxSLNzhDp1LAdPjZVd6BO48xLgF6TLo+S6NJES7No13oRHu3JxbrhcRBD8yffjlGFhsCcp8fAUKbgVYPI+IJ1XVoUB774PW7by9xHcBKAYQjOkZ+w+kpzGC88BLHzsM5l9+/vl50FLzWtiwwlB/sEJ/vHT9MqCdYwLh0vVz480CErktz/grOLjAduYGFvksCDo2PLyYhQmUgArK0Zaw884K/aruWXao+C4hmKiJsWfxYqJy5SqFrVLYbqFW25W3Dbu2nbseSgW/nm/xAc0eJqQWRf1eZ2L2QRwR8krWdkp+LwZeCVduoDSYloVcjwbmuYslFYATkGovBV+nGv7Y01SFM1bWJ5IASkQ8MQA2/fTXlydMdhECmUtu4VfNQWuNBZzwAAuCVqDoIP3jkKF8pr46ejj8iPRPhKivjmQJXr6EQ9uiVRAvX3K26NKYjidMpev++egPoFbOrmfQKwXx70Kxu7vwWeRi679BWqWuJ/U7X0HXvgLsLZL5fOitXOTNKvtwcIB4V5onFk/MCd4P9Yn5BycGoj0fmR30k0p0ceasDJ1XQuWT9OnN1OwZ/d+68uEC0f7NtEfs5VGdSM1qNw+yeD41rvZxm8RVKMZeqK3lTRWrWEu466Iwq6MrzSlK4lAVeZOjHqvUIurii8TjlNBST1O6JpYJ96qMSgqfTPTgJLM2kujcWgEv3yHN45p7xHxVscaKdqLbESEooO+z+Ew+TOkAipKHeqcVYxMiBw5yahWVKk1bHBxV8/Eq4FiC77ogCXLxNBzMATXWAZ5DtpnlEWQ5n/MUHTkqhLfuauUGC6icm62hFlkgCiXcZoHze/VVrB4LyhB1lkpPlY2SIFmEtC+DhUFjXotoMJ9lVYJq1oogxbbsJXJyChYFxbMWykl11xiRAE7q5q7cYhqsLPuWgcl2cAOKSwyzKwqujEQtAl/u14+hhdJvAqwlWGV2JVcnZnLaabqBLROradEkv4yp1TcqRigzbuUdTWH1Th9TXUgJXsnf05XKF5A3FWVvU6QcbWChy8oilo8oIkkC13IiuLPCRDIW7hpx6Uxp+MtjFSjohlGpmpVYNmjQimpxzVUpeD8Di9KBbL1l222HN1vXx+UFHTMJzQOzKK/KLU04r4TDFR427WflLXybWD5d0vpTw9CHk1J0D0sG7fAGTU6uS4+QptOTnnGhl8Cl7O4xQzlE/hqRPvZXFkFM3au4nCnSsXqsHksxE7AKpFgoWpkT8ThnAU0kG/vE4IYsnLaYytClFcAhJoD+FVkeUHyUO5WZFSIOSA2hpleq8UoVuJw23dwmiokZaGxfgPTXX0mS226e95Lf/AYkEd+mGf7q4DNTUPjK7ednChUiGq36w8G5S8KWgD3DqAPikp5gDleiq4wKgJeNI1vhN6aVnqw6ykWBXAbynFuHJPAfGNzaDNL3Kl18idmUirNytuQcGRxRjOOvswuKyrq4tlB71aR39RKpEnDtTH2EodauO7nhQOWufiTg/hCW3FjYo9x/2Q8jFvDUT5gD2yV9JfMbOeizc8w9xAD+/WQhp7NaT/5LqajcM/6ZooHuKbFsehnN0Nss763d192+CblafVbpyIaiGTKzYkhSr5ZPpbo92zS6v+IacLr4YlJ/1ZU3NXiCFFlUy2hsoMkbDm6SHNcg18oYPITKhU3CCYUSKwjnmPhdKXxQXz28VNIN8vrPgwSKEi7xXTkTOUpg+ShkfExSm91I/r3gv6KElLgrxcb+CgdMxLo/Mj5XbxmAa4oLsIOSlsfb9PK1dSxPaNJeqT3Q4mTkJu23+9qi8ihByC5ikhTWXN0uulIqYEXDYNw4AG965kkZolgt0u8sWkyT5Ky1ECqLWESYpMyv4c71PIhCxCJDKojh9gBWJOBSLRLPkuxcl7PwpSoDOb+VV6IBm3rKq85uBapSZJey3BiD972JnijNzeVFkXF9PV2p4vOH6UXpKLMWhst0oBc47Lcbgu8/l65zOp6MrpNbVWZOe8Z/1WqQLJNoTJkaV2fdrPZR0HELCNEcHkYqX1HIMousHZZl+WcgXlrJE16DHYUU+/mCHSfKdswoZGYdZ6Y7N303ZAh0KYkQr23fpdn/LriCTPRZor6Hg27nryrwhxIIHor7I/c4bhmItFNybuVGBHkVWu5kapOYzyaFwOwXFBGMtRJmJ+6CIlcaprXwW9yhCp/SG+gti5kUtS6u94Vlxet2biV9hEz2xbHii8nofHQGaQszGwYbB45LXRyAvUT2LeAAavoNOLARGDdgL61ggZjDydqJnApsdw6Hh1n7hJjseaelpEpJryX82oWTvxwdwcuX8BGUgFnb2uYtl+5/slrVkazgxhWhs1/z8t/6sQLQMl3aBm6LMLZMlzpcxm79cN9i61os3bPiAdCW2Efa8vMKEfZQKV4oSPsXVxHXyTnwrUXZf96/GpiT0aiobRfdPubgunehp2XvU84xMVhJT/ISgeunsY9gUQypB5M3+Q5xpQOvfJy07NqUCBS1VTbZvgwRmxJVvL0EkujK/5djOGEx0jHYlIU2SZCysmzEglXVxdmRGGyu86mEm5Sost4m6vrIARxRyGmylR5r14LkmJUrea67qj9h8y/Mm2nZSnxU8RgNqqW3OU8hXLLyybRLb4F+Nyplx2olVHqn00YrLlbfSYenUsDB9i0ivxsFUvA1CpyP+pd6m4ikt1kEUWvxfE039Envgn/8I2cAkj0W7Bhzgv22UyT3gzU4X8UmbNVbai2E7AC5hsrT1Cq//XzSXpVrgER6ngKH4/N130g4HL7DpL90A6vZLV+CNaZDJi/ZqzI29y5B45SW5xWgu4fy4TaKh+C5Ic27kw7+4dtE9V2b4BDPqWpjXzuAB7DubuFgsyJuQEE+iQ+OBKpa35WnUbjfBiEl0IUw2Wd+KH0fnn0fSq9BPnkN8ulRDBkGISUFCpWLTUne8FhktGqtJzCrgBwm6XM3cMC3C2znmEDConr+z+/JJvl2qqRJo21l84//8ekHqfEoluJK221FDrpF1JiDjbO7OwXBQagJaMeeWF8YQ+2guMl7vgQVqFVNUabSPH7ypnKEMgRsvEclhJfbyb1A1rq40uj9+cayJFVh1BIK5bg1qFPRfuILlb+pH5ntIb7bviA1Dsl7i9NVKjS1al56tZmJS3o0dL/ChPIjKawosNOEJn0NMgVnROUdNDz19cVtVGu1vcXCBA/m1B0WFaOyl6kwFVVzI51J8ml8UHRQrvU8QapF9vKD8LH68Vj5f59+aBlVxI9NKd9P3nCUjdP+9wP27+/BQbXtsiHybcfdxx7XTe63f/xtL1EKqFD1D4oyx8S3KBxsNqqBVjh0KSaf4/hss1En1iL+1inAnT7VVBb3mTZ2UFf+/zWzLBdj8F0XjsW6ksaNxUyOtoXq1ana3r0HhdMTrnqAu6XrISDIclKOVLzUs41F/iMy2ZXoLcMubqwW6lYrSM6vtMDj2AW5T6mNxbx1VeYNO1qt4XNZRtKgdHJ6nF7OKnZzZWnki2pMzdqngcChY1F09Fo+XOKQMoNx9BpCahHaF65O6xe89wApKSckX4Qh7QCMAqcFbPkuvZHkDsipYVtIZNbk0r8aTc8zaUxvVVl42/dwJIo2/vf5oDSMLQKvgz/dKzwGoT/KTu+LE4fP/zHLlofL345NE1yEFl1w5dv0mbInGU5dfZtxahVPzoSllrPpW/nRXHNrtlZgVhszmjQSGezcEorHRAa0YrUbU9KCbP3oTuU7RYwd3ymC14gQ10HZq/J9HMzdRZm6pD1i3De1JF9TxKif/q/a84XqaG+OzeQFCjNALERgMNhIyqHsa1I2NWCp0NgWhb/9TR+9g19/FUxxLGqFOCI2OkumJyJwVib6q5X3mW3KcM82PoP0ekwfvevEnRfs438CAAD//yEZ8LDwSQAA - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 8b0b0049fde..6167d63b4b3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 4fd8cd84b97..3592b4fb41b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 428e4f26c40..dd52ea4be15 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index aaabf3fa837..ba3da51e77a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 8d5db5bf2a4..8725070c74c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 0ed105d7932..4f9cbef6294 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 85cfb584d68..dbe3ab889be 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/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" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index e111a8e989e..946033bef72 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 996d42d79cf..06199d2250d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 38ac1fb3d7f..41c82e4c6ef 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 0bd42caab25..e5dd5225042 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 4d86c3ba662..5e93222dd49 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index e111a8e989e..946033bef72 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index e111a8e989e..946033bef72 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index b2c5e6e5a93..bd9b881145c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 1deeba5ed1c..85775b01398 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 428e4f26c40..dd52ea4be15 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/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" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index e111a8e989e..946033bef72 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/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" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 06dc287b516..b42a3b6caaf 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line39.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" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 06dc287b516..b42a3b6caaf 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.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" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 06dc287b516..b42a3b6caaf 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.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" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 06dc287b516..b42a3b6caaf 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.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" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 06dc287b516..b42a3b6caaf 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.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" diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 7c630828091..41204bde58d 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -32,7 +32,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImage/line35.sh b/pkg/agent/testdata/CustomizedImage/line35.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/CustomizedImage/line35.sh +++ b/pkg/agent/testdata/CustomizedImage/line35.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" diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 7c630828091..41204bde58d 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -32,7 +32,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImageKata/line35.sh b/pkg/agent/testdata/CustomizedImageKata/line35.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line35.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line35.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" diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 9212305c12d..63cd6373b06 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line39.sh b/pkg/agent/testdata/MarinerV2+Kata/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line39.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line39.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" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 9212305c12d..63cd6373b06 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.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" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 9212305c12d..63cd6373b06 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.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" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 9212305c12d..63cd6373b06 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.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" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 9212305c12d..63cd6373b06 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.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" diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index d043657a965..ce0fd08b9fb 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntu/line40.sh b/pkg/agent/testdata/RawUbuntu/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/RawUbuntu/line40.sh +++ b/pkg/agent/testdata/RawUbuntu/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" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 774e41b6ca8..f6181fbdc61 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh b/pkg/agent/testdata/RawUbuntuContainerd/line40.sh index bf936ab51da..28a3b821bd5 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/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" diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 8f3b1514517..94172ed9546 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -3122,10 +3122,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" diff --git a/vhdbuilder/packer/init-variables.sh b/vhdbuilder/packer/init-variables.sh index 46a48f617c0..39cb5d3de82 100755 --- a/vhdbuilder/packer/init-variables.sh +++ b/vhdbuilder/packer/init-variables.sh @@ -217,8 +217,6 @@ if [ -n "${LINUX_MSI_RESOURCE_ID}" ]; then linux_msi_resource_ids+=(${LINUX_MSI_RESOURCE_ID}) fi -private_packages_url="" - # shellcheck disable=SC2236 if [ "$OS_TYPE" == "Windows" ]; then imported_windows_image_name="" @@ -382,6 +380,7 @@ if [ "$OS_TYPE" == "Windows" ]; then fi fi +private_packages_url="" # Set linux private packages url if the pipeline variable is set if [ -n "${PRIVATE_PACKAGES_URL}" ]; then echo "PRIVATE_PACKAGES_URL is set in pipeline variables: ${PRIVATE_PACKAGES_URL}" diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh index 4dbc818e4f7..566182b3f51 100644 --- a/vhdbuilder/packer/install-dependencies.sh +++ b/vhdbuilder/packer/install-dependencies.sh @@ -1,5 +1,4 @@ #!/bin/bash -echo "install-dependencies.sh...start" OS=$(sort -r /etc/*-release | gawk 'match($0, /^(ID_LIKE=(coreos)|ID=(.*))$/, a) { print toupper(a[2] a[3]); exit }') OS_VERSION=$(sort -r /etc/*-release | gawk 'match($0, /^(VERSION_ID=(.*))$/, a) { print toupper(a[2] a[3]); exit }' | tr -d '"') UBUNTU_OS_NAME="UBUNTU" @@ -420,9 +419,9 @@ cacheKubePackageFromPrivateUrl() { export AZCOPY_AUTO_LOGIN_TYPE="MSI" export AZCOPY_MSI_RESOURCE_STRING="$LINUX_MSI_RESOURCE_IDS" - cachedpkg="${K8S_CACHE_DIR}/${k8s_tgz_name}" - echo "download private package ${kube_private_binary_url} and store as ${cachedpkg}" - if ! ./azcopy copy "${kube_private_binary_url}" "${cachedpkg}"; then + cached_pkg="${K8S_CACHE_DIR}/${k8s_tgz_name}" + echo "download private package ${kube_private_binary_url} and store as ${cached_pkg}" + if ! ./azcopy copy "${kube_private_binary_url}" "${cached_pkg}"; then exit $ERR_PRIVATE_K8S_PKG_ERR fi } @@ -463,6 +462,6 @@ for PATCHED_KUBE_BINARY_VERSION in ${KUBE_BINARY_VERSIONS}; do extractKubeBinaries $KUBERNETES_VERSION "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz" done -rm -f ./azcopy # cleanup immediately after usage will retrun in two downloads +rm -f ./azcopy # cleanup immediately after usage will return in two downloads echo "install-dependencies step completed successfully" diff --git a/vhdbuilder/scripts/linux/tool_installs.sh b/vhdbuilder/scripts/linux/tool_installs.sh index cb25a2fd3f7..300291e8095 100644 --- a/vhdbuilder/scripts/linux/tool_installs.sh +++ b/vhdbuilder/scripts/linux/tool_installs.sh @@ -6,6 +6,7 @@ ERR_BCC_INSTALL_TIMEOUT=170 {{/* Timeout waiting for bcc install */}} ERR_BPFTRACE_BIN_DOWNLOAD_FAIL=171 {{/* Failed to download bpftrace binary */}} ERR_BPFTRACE_TOOLS_DOWNLOAD_FAIL=172 {{/* Failed to download bpftrace default programs */}} ERR_BPFTRACE_TOOLS_INSTALL_TIMEOUT=173 {{/* Failed to install bpftrace default programs */}} +ERR_AZCOPY_TOOLS_DOWNLOAD_FAIL=174 {{/* Failed to download azcopy */}} BPFTRACE_DOWNLOADS_DIR="/opt/bpftrace/downloads" UBUNTU_CODENAME=$(lsb_release -c -s) @@ -54,23 +55,23 @@ getAzCopyCurrentPath() { else echo "get azcopy at \"${PWD}\"...start" # Download and extract - azcopydownloadurl="https://azcopyvnext.azureedge.net/releases/release-10.22.1-20231220/azcopy_linux_amd64_10.22.1.tar.gz" - azcopysha256="7549424d56ab2d8b4033c84c2a9bb167dc2dcbb23998acd7fffb37bc1a71a267" + local azcopyDownloadURL="https://azcopyvnext.azureedge.net/releases/release-10.22.1-20231220/azcopy_linux_amd64_10.22.1.tar.gz" + local azcopySha256="7549424d56ab2d8b4033c84c2a9bb167dc2dcbb23998acd7fffb37bc1a71a267" if [[ $(isARM64) == 1 ]]; then - azcopydownloadurl="https://azcopyvnext.azureedge.net/releases/release-10.22.1-20231220/azcopy_linux_arm64_10.22.1.tar.gz" - azcopysha256="4db9a4b48abc7775f1a5d6d928afc42361dcc57bbfcde23ac82e4c419a0dc8fc" + azcopyDownloadURL="https://azcopyvnext.azureedge.net/releases/release-10.22.1-20231220/azcopy_linux_arm64_10.22.1.tar.gz" + azcopySha256="4db9a4b48abc7775f1a5d6d928afc42361dcc57bbfcde23ac82e4c419a0dc8fc" fi - downloadedpkg="downloadazcopy" + local downloadedPkg="downloadazcopy" pkgprefix="azcopy_linux_" - wget "$azcopydownloadurl" -O "$downloadedpkg" && - echo "$azcopysha256 $downloadedpkg" | sha256sum --check >/dev/null && - tar -xvf ./$downloadedpkg && + retrycmd_if_failure 30 5 60 curl -fSL -k -o "$downloadedPkg" "$azcopyDownloadURL" || exit $ERR_AZCOPY_TOOLS_DOWNLOAD_FAIL && + echo "$azcopySha256 $downloadedPkg" | sha256sum --check >/dev/null && + tar -xvf ./$downloadedPkg && cp ./$pkgprefix*/azcopy ./azcopy && chmod +x ./azcopy - rm -f $downloadedpkg + rm -f $downloadedPkg rm -rf ./$pkgprefix*/ echo "get azcopy...done"