From 5d9c90f8e6f17d2f9e5723f53c246b4d74f819c3 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Tue, 4 Mar 2025 15:39:49 -0800 Subject: [PATCH 01/19] perf: validate credentials before starting kubelet to reduce startup latency --- e2e/validation.go | 7 +- e2e/validators.go | 7 +- .../cloud-init/artifacts/kubelet.service | 2 + .../artifacts/validate-kubelet-credentials.sh | 50 +++++++++++++ parts/linux/cloud-init/nodecustomdata.yml | 7 ++ pkg/agent/baker_test.go | 6 +- pkg/agent/const.go | 1 + .../AKSUbuntu1604+Containerd/CustomData | 9 ++- .../AKSUbuntu1604+Containerd/line105.sh | 2 + .../AKSUbuntu1604+Containerd/line315.sh | 49 +++++++++++++ .../line329.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../testdata/AKSUbuntu1604+Docker/CustomData | 9 ++- .../testdata/AKSUbuntu1604+Docker/line105.sh | 2 + .../testdata/AKSUbuntu1604+Docker/line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh | 0 .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 9 ++- .../AKSUbuntu1604+GPUDedicatedVHD/line105.sh | 2 + .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 49 +++++++++++++ .../line336.sh} | 0 .../testdata/AKSUbuntu1604+K8S115/CustomData | 9 ++- .../testdata/AKSUbuntu1604+K8S115/line105.sh | 2 + .../testdata/AKSUbuntu1604+K8S115/line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../testdata/AKSUbuntu1604+K8S117/CustomData | 9 ++- .../testdata/AKSUbuntu1604+K8S117/line105.sh | 2 + .../testdata/AKSUbuntu1604+K8S117/line314.sh | 49 +++++++++++++ .../line328.sh | 0 .../testdata/AKSUbuntu1604+K8S118/CustomData | 9 ++- .../testdata/AKSUbuntu1604+K8S118/line105.sh | 2 + .../testdata/AKSUbuntu1604+K8S118/line314.sh | 49 +++++++++++++ .../line328.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../AKSUbuntu1604+OSKubeletDisk/CustomData | 9 ++- .../AKSUbuntu1604+OSKubeletDisk/line105.sh | 2 + .../AKSUbuntu1604+OSKubeletDisk/line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line316.sh | 49 +++++++++++++ .../line330.sh} | 0 .../AKSUbuntu1604+TempDiskExplicit/CustomData | 9 ++- .../AKSUbuntu1604+TempDiskExplicit/line105.sh | 2 + .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 49 +++++++++++++ .../line330.sh} | 0 .../AKSUbuntu1604+TempDiskToggle/CustomData | 9 ++- .../AKSUbuntu1604+TempDiskToggle/line105.sh | 2 + .../AKSUbuntu1604+TempDiskToggle/line316.sh | 49 +++++++++++++ .../line330.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line321.sh | 49 +++++++++++++ .../line335.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line321.sh | 49 +++++++++++++ .../line335.sh} | 0 .../AKSUbuntu1804+Containerd+MIG/CustomData | 9 ++- .../AKSUbuntu1804+Containerd+MIG/line105.sh | 2 + .../AKSUbuntu1804+Containerd+MIG/line321.sh | 49 +++++++++++++ .../line335.sh} | 0 .../AKSUbuntu1804+Containerd+MotD/CustomData | 9 ++- .../AKSUbuntu1804+Containerd+MotD/line105.sh | 2 + .../AKSUbuntu1804+Containerd+MotD/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line322.sh | 49 +++++++++++++ .../line336.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu1804+CustomCATrust/CustomData | 9 ++- .../AKSUbuntu1804+CustomCATrust/line105.sh | 2 + .../AKSUbuntu1804+CustomCATrust/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu1804+HTTPProxy/CustomData | 9 ++- .../AKSUbuntu1804+HTTPProxy/line105.sh | 2 + .../AKSUbuntu1804+HTTPProxy/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 9 ++- .../testdata/AKSUbuntu1804+NoneCNI/line105.sh | 2 + .../testdata/AKSUbuntu1804+NoneCNI/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu1804+krustlet/CustomData | 9 ++- .../AKSUbuntu1804+krustlet/line105.sh | 2 + .../AKSUbuntu1804+krustlet/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../testdata/AKSUbuntu2204+China/CustomData | 9 ++- .../testdata/AKSUbuntu2204+China/line105.sh | 2 + .../testdata/AKSUbuntu2204+China/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line321.sh | 49 +++++++++++++ .../line335.sh} | 0 .../AKSUbuntu2204+Containerd+MIG/CustomData | 9 ++- .../AKSUbuntu2204+Containerd+MIG/line105.sh | 2 + .../AKSUbuntu2204+Containerd+MIG/line321.sh | 49 +++++++++++++ .../line335.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../AKSUbuntu2204+CustomCloud/CustomData | 9 ++- .../AKSUbuntu2204+CustomCloud/line105.sh | 2 + .../AKSUbuntu2204+CustomCloud/line315.sh | 49 +++++++++++++ .../line329.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu2204+OutboundTypeNil/CustomData | 9 ++- .../AKSUbuntu2204+OutboundTypeNil/line105.sh | 2 + .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu2204+OutboundTypeNone/CustomData | 9 ++- .../AKSUbuntu2204+OutboundTypeNone/line105.sh | 2 + .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu2204+SSHStatusOff/CustomData | 9 ++- .../AKSUbuntu2204+SSHStatusOff/line105.sh | 2 + .../AKSUbuntu2204+SSHStatusOff/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../AKSUbuntu2204+SSHStatusOn/CustomData | 9 ++- .../AKSUbuntu2204+SSHStatusOn/line105.sh | 2 + .../AKSUbuntu2204+SSHStatusOn/line314.sh | 49 +++++++++++++ .../line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line322.sh | 49 +++++++++++++ .../line336.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line322.sh | 49 +++++++++++++ .../line336.sh} | 0 .../AKSUbuntu2204+SecurityProfile/CustomData | 9 ++- .../AKSUbuntu2204+SecurityProfile/line105.sh | 2 + .../AKSUbuntu2204+SecurityProfile/line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../AKSUbuntu2204+cgroupv2/CustomData | 9 ++- .../AKSUbuntu2204+cgroupv2/line105.sh | 2 + .../AKSUbuntu2204+cgroupv2/line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../CustomData | 9 ++- .../line105.sh | 2 + .../line315.sh | 49 +++++++++++++ .../{line322.sh => line329.sh} | 0 .../AKSUbuntu2404+NetworkPolicy/CustomData | 9 ++- .../AKSUbuntu2404+NetworkPolicy/line105.sh | 2 + .../AKSUbuntu2404+NetworkPolicy/line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../AKSUbuntu2404+Teleport/CustomData | 9 ++- .../AKSUbuntu2404+Teleport/line105.sh | 2 + .../AKSUbuntu2404+Teleport/line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 .../testdata/AzureLinuxV2+Kata/CustomData | 9 ++- .../testdata/AzureLinuxV2+Kata/line103.sh | 2 + .../testdata/AzureLinuxV2+Kata/line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 pkg/agent/testdata/CustomizedImage/CustomData | 9 ++- pkg/agent/testdata/CustomizedImage/line100.sh | 2 + pkg/agent/testdata/CustomizedImage/line309.sh | 49 +++++++++++++ .../{line316.sh => line323.sh} | 0 .../testdata/CustomizedImageKata/CustomData | 9 ++- .../testdata/CustomizedImageKata/line100.sh | 2 + .../testdata/CustomizedImageKata/line309.sh | 49 +++++++++++++ .../{line316.sh => line323.sh} | 0 .../testdata/MarinerV2+CustomCloud/CustomData | 9 ++- .../testdata/MarinerV2+CustomCloud/line103.sh | 2 + .../testdata/MarinerV2+CustomCloud/line312.sh | 49 +++++++++++++ .../{line319.sh => line326.sh} | 0 pkg/agent/testdata/MarinerV2+Kata/CustomData | 9 ++- pkg/agent/testdata/MarinerV2+Kata/line103.sh | 2 + pkg/agent/testdata/MarinerV2+Kata/line311.sh | 49 +++++++++++++ .../MarinerV2+Kata/{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 .../CustomData | 9 ++- .../line103.sh | 2 + .../line311.sh | 49 +++++++++++++ .../{line318.sh => line325.sh} | 0 pkg/agent/testdata/RawUbuntu/CustomData | 9 ++- pkg/agent/testdata/RawUbuntu/line105.sh | 2 + pkg/agent/testdata/RawUbuntu/line315.sh | 49 +++++++++++++ .../RawUbuntu/{line322.sh => line329.sh} | 0 .../testdata/RawUbuntuContainerd/CustomData | 9 ++- .../testdata/RawUbuntuContainerd/line105.sh | 2 + .../testdata/RawUbuntuContainerd/line314.sh | 49 +++++++++++++ .../{line321.sh => line328.sh} | 0 pkg/agent/variables.go | 73 ++++++++++--------- vhdbuilder/packer/packer_source.sh | 3 + .../packer/vhd-image-builder-arm64-gen2.json | 5 ++ vhdbuilder/packer/vhd-image-builder-base.json | 5 ++ vhdbuilder/packer/vhd-image-builder-cvm.json | 5 ++ .../vhd-image-builder-mariner-arm64.json | 5 ++ .../packer/vhd-image-builder-mariner.json | 5 ++ 374 files changed, 5450 insertions(+), 131 deletions(-) create mode 100644 parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh create mode 100644 pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+GPUDedicatedVHD => AKSUbuntu1604+Containerd}/line329.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+NSeriesSku => AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig}/line329.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh rename pkg/agent/testdata/{AKSUbuntu2204+SecureTLSBoostrapping => AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig}/line329.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh rename pkg/agent/testdata/{AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource => AKSUbuntu1604+Disable1804SystemdResolved=false}/line329.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+Containerd/line322.sh => AKSUbuntu1604+Disable1804SystemdResolved=true/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line322.sh => AKSUbuntu1604+Docker/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line322.sh => AKSUbuntu1604+DynamicKubeletConfig/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd++GPU+runcshimv2 => AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent}/line328.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh rename pkg/agent/testdata/{AKSUbuntu1604+Disable1804SystemdResolved=false/line322.sh => AKSUbuntu1604+GPUDedicatedVHD/line336.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+Disable1804SystemdResolved=true/line322.sh => AKSUbuntu1604+K8S115/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+MIG+NoFabricManager => AKSUbuntu1604+K8S117}/line328.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+MIG => AKSUbuntu1604+K8S118}/line328.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+Docker/line322.sh => AKSUbuntu1604+KubeletConfigFile/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh rename pkg/agent/testdata/{AKSUbuntu1604+DynamicKubeletConfig/line322.sh => AKSUbuntu1604+OSKubeletDisk/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh rename pkg/agent/testdata/{AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line321.sh => AKSUbuntu1604+TempDisk+Containerd/line330.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh rename pkg/agent/testdata/{AKSUbuntu1604+K8S115/line322.sh => AKSUbuntu1604+TempDiskExplicit/line330.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh rename pkg/agent/testdata/{AKSUbuntu1604+K8S117/line321.sh => AKSUbuntu1604+TempDiskToggle/line330.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+Containerd+MIG+ArtifactStreaming => AKSUbuntu1804+ArtifactStreaming}/line328.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh rename pkg/agent/testdata/{AKSUbuntu1604+K8S118/line321.sh => AKSUbuntu1804+Containerd++GPU+runcshimv2/line335.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+Containerd+MIG => AKSUbuntu1804+Containerd+Certsd}/line328.sh (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh rename pkg/agent/testdata/{AKSUbuntu1604+KubeletConfigFile/line322.sh => AKSUbuntu1804+Containerd+ContainerdVersion/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh rename pkg/agent/testdata/{AKSUbuntu1604+OSKubeletDisk/line322.sh => AKSUbuntu1804+Containerd+IPAddress+FQDN/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh rename pkg/agent/testdata/{AKSUbuntu1604+TempDisk+Containerd/line323.sh => AKSUbuntu1804+Containerd+IPMasqAgent/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh rename pkg/agent/testdata/{AKSUbuntu1604+TempDiskExplicit/line323.sh => AKSUbuntu1804+Containerd+Kubenet+Calico/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh rename pkg/agent/testdata/{AKSUbuntu1604+TempDiskToggle/line323.sh => AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+ArtifactStreaming/line321.sh => AKSUbuntu1804+Containerd+Kubenet/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+Certsd/line321.sh => AKSUbuntu1804+Containerd+MIG+NoFabricManager/line335.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+ContainerdVersion/line321.sh => AKSUbuntu1804+Containerd+MIG/line335.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+IPAddress+FQDN/line321.sh => AKSUbuntu1804+Containerd+MotD/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+IPMasqAgent/line321.sh => AKSUbuntu1804+Containerd+NSeriesSku/line336.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+Kubenet+Calico/line321.sh => AKSUbuntu1804+Containerd+PrivateACR/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line321.sh => AKSUbuntu1804+Containerd+Teleport/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+Kubenet/line321.sh => AKSUbuntu1804+Containerd+runcshimv2/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+MotD/line321.sh => AKSUbuntu1804+CustomCATrust/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+PrivateACR/line321.sh => AKSUbuntu1804+Disable1804SystemdResolved=false/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+Teleport/line321.sh => AKSUbuntu1804+Disable1804SystemdResolved=true/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Containerd+runcshimv2/line321.sh => AKSUbuntu1804+DisableCustomData/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+CustomCATrust/line321.sh => AKSUbuntu1804+HTTPProxy/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Disable1804SystemdResolved=false/line321.sh => AKSUbuntu1804+KubeletClientTLSBootstrapping/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+Disable1804SystemdResolved=true/line321.sh => AKSUbuntu1804+NoArtifactStreaming/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+DisableCustomData/line321.sh => AKSUbuntu1804+NoneCNI/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+HTTPProxy/line321.sh => AKSUbuntu1804+WithKubeletClientCert/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+KubeletClientTLSBootstrapping/line321.sh => AKSUbuntu1804+krustlet/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+NoArtifactStreaming/line321.sh => AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh rename pkg/agent/testdata/{AKSUbuntu1804+NoneCNI/line321.sh => AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+WithKubeletClientCert/line321.sh => AKSUbuntu1804Containerd+RuncVersion/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+China/line314.sh rename pkg/agent/testdata/{AKSUbuntu1804+krustlet/line321.sh => AKSUbuntu2204+China/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh rename pkg/agent/testdata/{AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line321.sh => AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line335.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh rename pkg/agent/testdata/{AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line322.sh => AKSUbuntu2204+Containerd+MIG/line335.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh rename pkg/agent/testdata/{AKSUbuntu1804Containerd+RuncVersion/line321.sh => AKSUbuntu2204+CustomCloud+ootcredentialprovider/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh rename pkg/agent/testdata/{AKSUbuntu2204+China/line321.sh => AKSUbuntu2204+CustomCloud/line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+CustomCloud+ootcredentialprovider/line322.sh => AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+CustomCloud/line322.sh => AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line321.sh => AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line321.sh => AKSUbuntu2204+DisableKubeletServingCertificateRotation/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line321.sh => AKSUbuntu2204+IMDSRestrictionOff/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+DisableKubeletServingCertificateRotation/line321.sh => AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+IMDSRestrictionOff/line321.sh => AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line321.sh => AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line321.sh => AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line321.sh => AKSUbuntu2204+KubeletServingCertificateRotation/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line321.sh => AKSUbuntu2204+OutboundTypeBlocked/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+KubeletServingCertificateRotation/line321.sh => AKSUbuntu2204+OutboundTypeNil/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+OutboundTypeBlocked/line321.sh => AKSUbuntu2204+OutboundTypeNone/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+OutboundTypeNil/line321.sh => AKSUbuntu2204+SSHStatusOff/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh rename pkg/agent/testdata/{AKSUbuntu2204+OutboundTypeNone/line321.sh => AKSUbuntu2204+SSHStatusOn/line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh rename pkg/agent/testdata/{AKSUbuntu2204+SSHStatusOff/line321.sh => AKSUbuntu2204+SecureTLSBoostrapping/line336.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh rename pkg/agent/testdata/{AKSUbuntu2204+SSHStatusOn/line321.sh => AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line336.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh rename pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh rename pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh rename pkg/agent/testdata/AKSUbuntu2204+cgroupv2/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh rename pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh rename pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/{line322.sh => line329.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh rename pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh rename pkg/agent/testdata/AKSUbuntu2404+Teleport/{line321.sh => line328.sh} (100%) create mode 100644 pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh rename pkg/agent/testdata/AzureLinuxV2+Kata/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh rename pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh rename pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh rename pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh rename pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/CustomizedImage/line309.sh rename pkg/agent/testdata/CustomizedImage/{line316.sh => line323.sh} (100%) create mode 100644 pkg/agent/testdata/CustomizedImageKata/line309.sh rename pkg/agent/testdata/CustomizedImageKata/{line316.sh => line323.sh} (100%) create mode 100644 pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh rename pkg/agent/testdata/MarinerV2+CustomCloud/{line319.sh => line326.sh} (100%) create mode 100644 pkg/agent/testdata/MarinerV2+Kata/line311.sh rename pkg/agent/testdata/MarinerV2+Kata/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh rename pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh rename pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh rename pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh rename pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/{line318.sh => line325.sh} (100%) create mode 100644 pkg/agent/testdata/RawUbuntu/line315.sh rename pkg/agent/testdata/RawUbuntu/{line322.sh => line329.sh} (100%) create mode 100644 pkg/agent/testdata/RawUbuntuContainerd/line314.sh rename pkg/agent/testdata/RawUbuntuContainerd/{line321.sh => line328.sh} (100%) diff --git a/e2e/validation.go b/e2e/validation.go index 25d595845be..fb9abe0bbb2 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -4,6 +4,7 @@ import ( "context" "encoding/base64" "fmt" + "strings" "github.com/Azure/agentbaker/e2e/config" "github.com/stretchr/testify/require" @@ -38,6 +39,10 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { stdout := execResult.stdout.String() require.NotContains(s.T, stdout, "--dynamic-config-dir", "kubelet flag '--dynamic-config-dir' should not be present in /etc/default/kubelet\nContents:\n%s") + kubeletLogs := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not retrieve kubelet logs with journalctl").stdout.String() + validatedKubeletCredentials := strings.Contains(kubeletLogs, "kubelet client credential is valid") || strings.Contains(kubeletLogs, "kubelet bootstrap token credential is valid") + require.True(s.T, validatedKubeletCredentials) + // the instructions belows expects the SSH key to be uploaded to the user pool VM. // which happens as a side-effect of execCommandOnVMForScenario, it's ugly but works. // maybe we should use a single ssh key per cluster, but need to be careful with parallel test runs. @@ -62,7 +67,7 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { //"cloud-config.txt", // file with UserData }) - execResult = execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo curl http://168.63.129.16:32526/vmSettings", 0, "curl to wireserver failed") + _ = execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo curl http://168.63.129.16:32526/vmSettings", 0, "curl to wireserver failed") execResult = execOnVMForScenarioOnUnprivilegedPod(ctx, s, "curl https://168.63.129.16/machine/?comp=goalstate -H 'x-ms-version: 2015-04-05' -s --connect-timeout 4") require.Equal(s.T, "28", execResult.exitCode, "curl to wireserver should fail") diff --git a/e2e/validators.go b/e2e/validators.go index 6f6e9b21c32..816427ae189 100644 --- a/e2e/validators.go +++ b/e2e/validators.go @@ -4,13 +4,14 @@ import ( "bytes" "context" "fmt" - "github.com/tidwall/gjson" "net" "os" "regexp" "strings" "time" + "github.com/tidwall/gjson" + "github.com/Azure/agentbaker/e2e/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -301,7 +302,7 @@ func ValidateContainerdWASMShims(ctx context.Context, s *Scenario) { func ValidateKubeletHasNotStopped(ctx context.Context, s *Scenario) { command := "sudo journalctl -u kubelet" - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not retrieve kubelet logs") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not retrieve kubelet logs with journalctl") assert.NotContains(s.T, execResult.stdout.String(), "Stopped Kubelet") assert.Contains(s.T, execResult.stdout.String(), "Started Kubelet") } @@ -314,7 +315,7 @@ func ValidateServicesDoNotRestartKubelet(ctx context.Context, s *Scenario) { // ValidateKubeletHasFlags checks kubelet is started with the right flags and configs. func ValidateKubeletHasFlags(ctx context.Context, s *Scenario, filePath string) { - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not get kubelet logs") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not retrieve kubelet logs with journalctl") configFileFlags := fmt.Sprintf("FLAG: --config=\"%s\"", filePath) require.Containsf(s.T, execResult.stdout.String(), configFileFlags, "expected to find flag %s, but not found", "config") } diff --git a/parts/linux/cloud-init/artifacts/kubelet.service b/parts/linux/cloud-init/artifacts/kubelet.service index 9f2b61e9716..4a54c5df11b 100644 --- a/parts/linux/cloud-init/artifacts/kubelet.service +++ b/parts/linux/cloud-init/artifacts/kubelet.service @@ -20,6 +20,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh new file mode 100644 index 00000000000..c6eee679865 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -0,0 +1,50 @@ +#!/bin/bash +set -euo pipefail + +# this gives us logs_to_events and retry wrappers +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/parts/linux/cloud-init/nodecustomdata.yml b/parts/linux/cloud-init/nodecustomdata.yml index 248a23f467c..bea6a19b32f 100644 --- a/parts/linux/cloud-init/nodecustomdata.yml +++ b/parts/linux/cloud-init/nodecustomdata.yml @@ -409,6 +409,13 @@ write_files: content: !!binary | {{GetVariableProperty "cloudInitData" "ensureIMDSRestrictionScript"}} +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "validateKubeletCredentialsScript"}} + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/baker_test.go b/pkg/agent/baker_test.go index feeee4e04aa..8218a714f99 100644 --- a/pkg/agent/baker_test.go +++ b/pkg/agent/baker_test.go @@ -787,7 +787,7 @@ var _ = Describe("Assert generated customData and cseCmd", func() { config.KubeletConfig = map[string]string{} }, nil), - Entry("AKSUbuntu1804 with kubelet client certificatet", "AKSUbuntu1804+WithKubeletClientCert", "1.18.3", + Entry("AKSUbuntu1804 with kubelet client certificate", "AKSUbuntu1804+WithKubeletClientCert", "1.18.3", func(config *datamodel.NodeBootstrappingConfiguration) { config.ContainerService.Properties.CertificateProfile = &datamodel.CertificateProfile{ ClientCertificate: "fooBarBaz", @@ -798,12 +798,14 @@ var _ = Describe("Assert generated customData and cseCmd", func() { etcDefaultKubelet := o.files["/etc/default/kubelet"].value etcDefaultKubeletService := o.files["/etc/systemd/system/kubelet.service"].value kubeletSh := o.files["/opt/azure/containers/kubelet.sh"].value + validateCredentials := o.files["/opt/azure/containers/validate-kubelet-credentials.sh"].value caCRT := o.files["/etc/kubernetes/certs/ca.crt"].value kubeconfig := o.files["/var/lib/kubelet/kubeconfig"].value Expect(etcDefaultKubelet).NotTo(BeEmpty()) Expect(etcDefaultKubeletService).NotTo(BeEmpty()) Expect(kubeletSh).NotTo(BeEmpty()) + Expect(validateCredentials).ToNot(BeEmpty()) Expect(caCRT).NotTo(BeEmpty()) Expect(kubeconfig).ToNot(BeEmpty()) @@ -822,6 +824,7 @@ var _ = Describe("Assert generated customData and cseCmd", func() { etcDefaultKubelet := o.files["/etc/default/kubelet"].value etcDefaultKubeletService := o.files["/etc/systemd/system/kubelet.service"].value kubeletSh := o.files["/opt/azure/containers/kubelet.sh"].value + validateCredentials := o.files["/opt/azure/containers/validate-kubelet-credentials.sh"].value bootstrapKubeconfig := o.files["/var/lib/kubelet/bootstrap-kubeconfig"].value caCRT := o.files["/etc/kubernetes/certs/ca.crt"].value @@ -829,6 +832,7 @@ var _ = Describe("Assert generated customData and cseCmd", func() { Expect(bootstrapKubeconfig).NotTo(BeEmpty()) Expect(kubeletSh).NotTo(BeEmpty()) Expect(etcDefaultKubeletService).NotTo(BeEmpty()) + Expect(validateCredentials).ToNot(BeEmpty()) Expect(caCRT).NotTo(BeEmpty()) Expect(bootstrapKubeconfig).To(ContainSubstring("token")) diff --git a/pkg/agent/const.go b/pkg/agent/const.go index 58150212ab0..90a021e7464 100644 --- a/pkg/agent/const.go +++ b/pkg/agent/const.go @@ -73,6 +73,7 @@ const ( migPartitionScript = "linux/cloud-init/artifacts/mig-partition.sh" migPartitionSystemdService = "linux/cloud-init/artifacts/mig-partition.service" ensureIMDSRestrictionScript = "linux/cloud-init/artifacts/ensure_imds_restriction.sh" + validateKubeletCredentialsScript = "linux/cloud-init/artifacts/validate-kubelet-credentials.sh" // scripts and service for enabling ipv6 dual stack. dhcpv6SystemdService = "linux/cloud-init/artifacts/dhcpv6.service" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index ed78941bfe7..fe6bac68bf5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line329.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line329.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 520bea3b8a4..861127a0046 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line329.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line329.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 520bea3b8a4..861127a0046 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line329.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line329.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 59adaef8e65..1d55b59298d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line329.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line329.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 59adaef8e65..1d55b59298d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index ed78941bfe7..fe6bac68bf5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index da9bb5850f4..794e3a6404b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line328.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line328.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 789f1b75720..3442d50e986 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -314,6 +314,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line336.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line336.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index ed78941bfe7..fe6bac68bf5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line328.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line328.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line328.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line328.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 520bea3b8a4..861127a0046 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index ed78941bfe7..fe6bac68bf5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 53141791745..e872f0f98ed 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -308,6 +308,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line321.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line330.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line321.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line330.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 9565097bcc7..bce9769c322 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -308,6 +308,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line330.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line322.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line330.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 53141791745..e872f0f98ed 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -308,6 +308,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line105.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line321.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line330.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line321.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line330.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line328.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line328.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 79d28d77fbe..d1e2986c000 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -313,6 +313,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line335.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line335.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 8ed88ceddcf..0404fa992bb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line328.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line328.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line322.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 43996553650..690a0d9dbfe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line322.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line323.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line323.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 9bc0835ef97..c017031cf0e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line323.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line323.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line323.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line323.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 79d28d77fbe..d1e2986c000 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -313,6 +313,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line335.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line335.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 79d28d77fbe..d1e2986c000 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -313,6 +313,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line335.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line335.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index ece24278513..6a13aa28a5b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -314,6 +314,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line336.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line336.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index fe3c8bceed2..80530a70c3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index ac024eeed11..ba2522c2730 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 8ed88ceddcf..0404fa992bb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 0a16b0f85c8..5d5be95fdd9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 540ca390fdb..5e561f24dd0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line105.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 13b75ef157e..dcd4d9f42ad 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line105.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index f626b345450..aa61a4b6258 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line105.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line321.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line105.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line321.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line321.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 473b94127da..a5b1185e6f7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -313,6 +313,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line335.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line335.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 060389ae61b..49d55b1c1f9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -313,6 +313,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line335.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line322.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line335.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 77cc1f4563b..300c8cf5c2b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 31bf4174468..e294681c910 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index fd9b66fb3bb..ecf3ac2f0dd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line322.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index fd9b66fb3bb..ecf3ac2f0dd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line322.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index fd9b66fb3bb..ecf3ac2f0dd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index e3465b428e7..c8bab64fa65 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index fd9b66fb3bb..ecf3ac2f0dd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 6aeac833752..f6124973985 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 9a86630fe56..876e5d24d08 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -314,6 +314,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line336.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line336.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 0cc35760363..662961bb493 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -314,6 +314,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line336.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line336.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index a11a27dc4f8..0010ae5beb1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 108190dbf17..36901f8154d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 9dfc9eb959f..736ac2e26c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line105.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line321.sh rename to pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 520bea3b8a4..861127a0046 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line105.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line322.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line329.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line322.sh rename to pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line329.sh diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 9aa6c189533..b0638d427a3 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line105.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line321.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line321.sh rename to pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line328.sh diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index d44055e8e21..a3318013a77 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line105.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line105.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line321.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line328.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2404+Teleport/line321.sh rename to pkg/agent/testdata/AKSUbuntu2404+Teleport/line328.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index b17a6a5bca1..8574ad32cfb 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line103.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line103.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line318.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line325.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line318.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line325.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index b17a6a5bca1..8574ad32cfb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line103.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line103.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line318.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line325.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line318.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line325.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index b17a6a5bca1..8574ad32cfb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line103.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line103.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line318.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line325.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line318.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line325.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index b17a6a5bca1..8574ad32cfb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line103.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line103.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line318.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line325.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line318.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line325.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index b17a6a5bca1..8574ad32cfb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line103.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line103.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line318.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line325.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line318.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line325.sh diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index b1abd2cbe49..78793cf4247 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -97,7 +97,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -301,6 +301,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/CustomizedImage/line100.sh b/pkg/agent/testdata/CustomizedImage/line100.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/CustomizedImage/line100.sh +++ b/pkg/agent/testdata/CustomizedImage/line100.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImage/line316.sh b/pkg/agent/testdata/CustomizedImage/line323.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line316.sh rename to pkg/agent/testdata/CustomizedImage/line323.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index b1abd2cbe49..78793cf4247 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -97,7 +97,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -301,6 +301,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/CustomizedImageKata/line100.sh b/pkg/agent/testdata/CustomizedImageKata/line100.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line100.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line100.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImageKata/line316.sh b/pkg/agent/testdata/CustomizedImageKata/line323.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line316.sh rename to pkg/agent/testdata/CustomizedImageKata/line323.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 2e6f7fd6ee8..197c30984a5 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -304,6 +304,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line103.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line103.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line319.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line326.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line319.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line326.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 8d45d9b380c..71a33ab58ac 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/MarinerV2+Kata/line103.sh b/pkg/agent/testdata/MarinerV2+Kata/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line103.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/line318.sh b/pkg/agent/testdata/MarinerV2+Kata/line325.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line318.sh rename to pkg/agent/testdata/MarinerV2+Kata/line325.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 8d45d9b380c..71a33ab58ac 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line103.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line103.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line318.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line325.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line318.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line325.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 8d45d9b380c..71a33ab58ac 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line103.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line103.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line318.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line325.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line318.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line325.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 8d45d9b380c..71a33ab58ac 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line103.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line103.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line318.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line325.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line318.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line325.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 8d45d9b380c..71a33ab58ac 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -100,7 +100,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -303,6 +303,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line103.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line103.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line103.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line103.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line318.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line325.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line318.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line325.sh diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index ed78941bfe7..fe6bac68bf5 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -307,6 +307,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/RawUbuntu/line105.sh b/pkg/agent/testdata/RawUbuntu/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/RawUbuntu/line105.sh +++ b/pkg/agent/testdata/RawUbuntu/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntu/line322.sh b/pkg/agent/testdata/RawUbuntu/line329.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line322.sh rename to pkg/agent/testdata/RawUbuntu/line329.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 6d4d1f51ee0..201d430dadf 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -102,7 +102,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5SUT0/bTBDG7/4Uq4jD+x4Wt7Q35EMCDopIExQn6iFE1no9IaOsx9HObICWfvfK+UMbCIj65N39Pc88uxrNdEIos+gS2HpcCdaUXIcCHEh0UVOJzc6NkUX6gCycxIF97GprXFwgxcsd+t2QcEIg97Vf6pocEpyK8XcgytYkBgl8ecrg12ghas8F/MfxaJpt/2bRCFiMl8S4e/PI+2UGNjmLUlqjr6kCki46SGIQG5cwN8HJc9IsWAvM6QNKJkYCJ5+/fonSB7BZ43TjIdncrDC8UHG9ktj8CB7i51i8tzrlxb/pgDh4yLEqOffA4tE2r3vcp1qW6JVeqXhtfOyweL7BR1hL+FY2bVUL52qqTv6r6kCintSdh5W6bb2sdNtST+reKu3+V9qB+qRm6lzJAkhty27kWhdI5auYrzfO1Rxbx9LvbCqzBM0L4+G1W3So0zE3SijEFA5YaVFkGg+HLEdRXL1EKVTg0e5Ff1Rv9Li6jdTu0xqocdNNg4I/OKG6BO1MAY6T1snP60kn7afjfDC8TPN+u5P2s1+tA8E6OTtc1y5UoFcu3CHpEv22j5sUnkCA4y2xBfgv7cm+2Lif5Z3hcJyNR+2bvNtvX2XHsIvhoNu7yru9fvouNG73Buno8gNMPpoMxr1vW7uj5NVoOHkn0uYgiqY9YjHOzTaDBcrOY1IFJ6gDg98Niuh3AAAA///KhjADugQAAA== + H4sIAAAAAAAC/5SUT0/jPBDG7/kUVsXhfQ8m78vuDeXQQooqui1qWu2hVJHjTOmozqTyjAvsst99lf5ht1AQ5BTbv+eZx3E80wmhzKJLYOtxJVhTch0KcCDRRU0lNjM3RhbpA7JwEgf2sautcXGBFC936HdDwgmB3Nd+qWtySHAqxt+BKFuTGCTw5SmDX6OFqD0X8B/Ho2m2fZtFI2AxXhLj7s0j74cZ2OQsSmmNvqYKSLroIIlBbFzC3AQnz0mzYC0wpw8omRgJnPz/9UuUPoDNGqcbD8lmZ4XhhYrrlcTmR/AQP8fivdUpLz6nA+LgIceq5NwDi0fbfN3jPtWyRK/0SsVr42OHxfMOPsJawreyaataOFdTdfJPVQcS9aTuPKzUbetlpduWelL3Vmn3r9IO1H9qps6VLIDUtuxGrnWBVL6K+XriXM2xdSz9zqYyS9C8MB5eu0WHOh1zo4RCTOGAlRZFpvFwyHIUxdVLlEIFHu1e9LmjXBuHpRHQu3zaeiiBBI3j5jz/uL1xY9RtpHaP1kBNNt387uAPVqguQTtTgOOkdfLzetJJ++k4Hwwv07zf7qT97FfrQLBOzg7HtQsV6JULd0i6RL+9FU0KTyDA8ZbYAvyX9mRfbNzP8s5wOM7Go/ZN3u23r7Jj2MVw0O1d5d1eP30XGrd7g3R0+QEmH00G4963rd1R8mo0nLwTabMQRdMesRjnZps2BWXnMamCE9SBwe/aTvQ7AAD//6+ZIOoIBQAA - path: /etc/systemd/system/mig-partition.service permissions: "0644" @@ -306,6 +306,13 @@ write_files: content: !!binary | H4sIAAAAAAAC/+xXe2/TPhT935/izL9K+yHV3YOHoGhCXVtQxPpQWoTQNFVpc9OapU5xXLGx9bsjJ+s73SgMCSryT6L4+vjec8+9tv/bO+hKddD14gEbaTn09HVd9pzmCc/dNF2nVnI/depOueM0i4LzCWdSxaSNOw6pHdU81Q+p7XVDsvZOvVV12x2nVml13Gqr7TrlttOod9wPZ9VOu9Gplerv7Ffp9KxaFIEXxjThjJSdbye5FBste0ZGysJV69ZwDW4+k1FvEIE3U7dRd8pwmkXkFuPgd0ZO4jYsGPR8HehxSDARhkkoMNaXInIbopyiVROf19CKyGVGwxmTAc4hvoEve4eL1zADUgwAUuzFccgYYxWTyYOupJGqXygUeGp8JQ2OWCAZIxWP9eqa1vf/n+AmMbarn4PnbjbElc9POE5OwI0eE8fFoldzz04piDQhxZCq/2Ns5tEbUO/S2n8dkBmQttipqRdq8vxrG0xs4llsicujZHYMYaZwooVb9DWNIAT2hY+jF68Kx8+fFe7eB0+PIUYwvRHEMH0JfxRpg5eH9k8vGg5JGQgx/eKl9y2L7vXJL8LzffLRvUapT8qcepekkcktgkivBx+QZ8aaOMRnVNxGc38eS0J/7g0EfcHhOr1zirMZXaYJUq0QrMmMtVpUx/RJR3A4+xnIlaQ622XzwRw5eNtwP5bcCo6wBxGvKf6Pzxtub6fVldAUxvTThRDI0FjBP1Ih3MH9K4RZISwT/JsLYXGxB3O0c4UQSDZhzJdxxg4322lSLsurQs+mNLufzZjdlS1grnpFWaq/T/F+RDFUZFKu1lu/iqCIfKtOn0IyxDc1rYod3izvQEfD7Tp9ZSbwRN5L6v4bxf0r+s3sDLvSuR/S75YCXm7ZjyvgrTr0rgl4kl4zkoN+5j3kvmP+xksEm6Uiu/WzQH4PAAD//7E5jbFFDgAA +- path: /opt/azure/containers/validate-kubelet-credentials.sh + permissions: "0755" + encoding: gzip + owner: root + content: !!binary | + H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + - path: /etc/kubernetes/certs/ca.crt permissions: "0600" encoding: base64 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line105.sh b/pkg/agent/testdata/RawUbuntuContainerd/line105.sh index dd335c71cfd..8d1c5124c28 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line105.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line105.sh @@ -19,6 +19,8 @@ ExecStartPre=/bin/mount --make-shared /var/lib/kubelet ExecStartPre=-/sbin/ebtables -t nat --list ExecStartPre=-/sbin/iptables -t nat --numeric --list +ExecStartPre=/bin/bash /opt/azure/containers/validate-kubelet-credentials.sh + ExecStart=/usr/local/bin/kubelet \ --enable-server \ --node-labels="${KUBELET_NODE_LABELS}" \ diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh new file mode 100644 index 00000000000..6bc63721281 --- /dev/null +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -0,0 +1,49 @@ +#!/bin/bash +set -euo pipefail + +source /opt/azure/containers/provision_source.sh + +KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" +BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" + +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} + +function validateKubeconfig { + local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + + echo "kubelet credential validation failed" + exit 1 + fi +} + +function validateKubeletCredentials { + if [ ! -f "$KUBECONFIG_PATH" ] && [ ! -f "$BOOTSTRAP_KUBECONFIG_PATH" ]; then + echo "both kubeconfig: $KUBECONFIG_PATH and bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH do not exist, unable to start kubelet" + exit 1 + fi + + if ! which kubectl; then + echo "kubectl not found, will skip kubelet credential validation" + exit 0 + fi + + if [ -f "$KUBECONFIG_PATH" ]; then + echo "will validate kubeconfig: $KUBECONFIG_PATH" + validateKubeconfig "$KUBECONFIG_PATH" + echo "kubelet client credential is valid" + exit 0 + fi + + echo "will validate bootstrap-kubeconfig: $BOOTSTRAP_KUBECONFIG_PATH" + validateKubeconfig "$BOOTSTRAP_KUBECONFIG_PATH" + echo "kubelet bootstrap token credential is valid" +} + +logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line321.sh b/pkg/agent/testdata/RawUbuntuContainerd/line328.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line321.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line328.sh diff --git a/pkg/agent/variables.go b/pkg/agent/variables.go index 28d2ad2f5a8..a3681632249 100644 --- a/pkg/agent/variables.go +++ b/pkg/agent/variables.go @@ -16,42 +16,43 @@ func getCustomDataVariables(config *datamodel.NodeBootstrappingConfiguration) pa cs := config.ContainerService cloudInitFiles := map[string]interface{}{ "cloudInitData": paramsMap{ - "provisionStartScript": getBase64EncodedGzippedCustomScript(kubernetesCSEStartScript, config), - "provisionScript": getBase64EncodedGzippedCustomScript(kubernetesCSEMainScript, config), - "provisionSource": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScript, config), - "provisionSourceUbuntu": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScriptUbuntu, config), - "provisionSourceMariner": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScriptMariner, config), - "provisionInstalls": getBase64EncodedGzippedCustomScript(kubernetesCSEInstall, config), - "provisionInstallsUbuntu": getBase64EncodedGzippedCustomScript(kubernetesCSEInstallUbuntu, config), - "provisionInstallsMariner": getBase64EncodedGzippedCustomScript(kubernetesCSEInstallMariner, config), - "provisionConfigs": getBase64EncodedGzippedCustomScript(kubernetesCSEConfig, config), - "provisionSendLogs": getBase64EncodedGzippedCustomScript(kubernetesCSESendLogs, config), - "provisionRedactCloudConfig": getBase64EncodedGzippedCustomScript(kubernetesCSERedactCloudConfig, config), - "customSearchDomainsScript": getBase64EncodedGzippedCustomScript(kubernetesCustomSearchDomainsScript, config), - "dhcpv6SystemdService": getBase64EncodedGzippedCustomScript(dhcpv6SystemdService, config), - "dhcpv6ConfigurationScript": getBase64EncodedGzippedCustomScript(dhcpv6ConfigurationScript, config), - "kubeletSystemdService": getBase64EncodedGzippedCustomScript(kubeletSystemdService, config), - "reconcilePrivateHostsScript": getBase64EncodedGzippedCustomScript(reconcilePrivateHostsScript, config), - "reconcilePrivateHostsService": getBase64EncodedGzippedCustomScript(reconcilePrivateHostsService, config), - "ensureNoDupEbtablesScript": getBase64EncodedGzippedCustomScript(ensureNoDupEbtablesScript, config), - "ensureNoDupEbtablesService": getBase64EncodedGzippedCustomScript(ensureNoDupEbtablesService, config), - "bindMountScript": getBase64EncodedGzippedCustomScript(bindMountScript, config), - "bindMountSystemdService": getBase64EncodedGzippedCustomScript(bindMountSystemdService, config), - "migPartitionSystemdService": getBase64EncodedGzippedCustomScript(migPartitionSystemdService, config), - "migPartitionScript": getBase64EncodedGzippedCustomScript(migPartitionScript, config), - "ensureIMDSRestrictionScript": getBase64EncodedGzippedCustomScript(ensureIMDSRestrictionScript, config), - "containerdKubeletDropin": getBase64EncodedGzippedCustomScript(containerdKubeletDropin, config), - "cgroupv2KubeletDropin": getBase64EncodedGzippedCustomScript(cgroupv2KubeletDropin, config), - "componentConfigDropin": getBase64EncodedGzippedCustomScript(componentConfigDropin, config), - "bindMountDropin": getBase64EncodedGzippedCustomScript(bindMountDropin, config), - "httpProxyDropin": getBase64EncodedGzippedCustomScript(httpProxyDropin, config), - "snapshotUpdateScript": getBase64EncodedGzippedCustomScript(snapshotUpdateScript, config), - "snapshotUpdateService": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdService, config), - "snapshotUpdateTimer": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdTimer, config), - "packageUpdateScriptMariner": getBase64EncodedGzippedCustomScript(packageUpdateScriptMariner, config), - "packageUpdateServiceMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdServiceMariner, config), - "packageUpdateTimerMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdTimerMariner, config), - "componentManifestFile": getBase64EncodedGzippedCustomScript(componentManifestFile, config), + "provisionStartScript": getBase64EncodedGzippedCustomScript(kubernetesCSEStartScript, config), + "provisionScript": getBase64EncodedGzippedCustomScript(kubernetesCSEMainScript, config), + "provisionSource": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScript, config), + "provisionSourceUbuntu": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScriptUbuntu, config), + "provisionSourceMariner": getBase64EncodedGzippedCustomScript(kubernetesCSEHelpersScriptMariner, config), + "provisionInstalls": getBase64EncodedGzippedCustomScript(kubernetesCSEInstall, config), + "provisionInstallsUbuntu": getBase64EncodedGzippedCustomScript(kubernetesCSEInstallUbuntu, config), + "provisionInstallsMariner": getBase64EncodedGzippedCustomScript(kubernetesCSEInstallMariner, config), + "provisionConfigs": getBase64EncodedGzippedCustomScript(kubernetesCSEConfig, config), + "provisionSendLogs": getBase64EncodedGzippedCustomScript(kubernetesCSESendLogs, config), + "provisionRedactCloudConfig": getBase64EncodedGzippedCustomScript(kubernetesCSERedactCloudConfig, config), + "customSearchDomainsScript": getBase64EncodedGzippedCustomScript(kubernetesCustomSearchDomainsScript, config), + "dhcpv6SystemdService": getBase64EncodedGzippedCustomScript(dhcpv6SystemdService, config), + "dhcpv6ConfigurationScript": getBase64EncodedGzippedCustomScript(dhcpv6ConfigurationScript, config), + "kubeletSystemdService": getBase64EncodedGzippedCustomScript(kubeletSystemdService, config), + "reconcilePrivateHostsScript": getBase64EncodedGzippedCustomScript(reconcilePrivateHostsScript, config), + "reconcilePrivateHostsService": getBase64EncodedGzippedCustomScript(reconcilePrivateHostsService, config), + "ensureNoDupEbtablesScript": getBase64EncodedGzippedCustomScript(ensureNoDupEbtablesScript, config), + "ensureNoDupEbtablesService": getBase64EncodedGzippedCustomScript(ensureNoDupEbtablesService, config), + "bindMountScript": getBase64EncodedGzippedCustomScript(bindMountScript, config), + "bindMountSystemdService": getBase64EncodedGzippedCustomScript(bindMountSystemdService, config), + "migPartitionSystemdService": getBase64EncodedGzippedCustomScript(migPartitionSystemdService, config), + "migPartitionScript": getBase64EncodedGzippedCustomScript(migPartitionScript, config), + "ensureIMDSRestrictionScript": getBase64EncodedGzippedCustomScript(ensureIMDSRestrictionScript, config), + "containerdKubeletDropin": getBase64EncodedGzippedCustomScript(containerdKubeletDropin, config), + "cgroupv2KubeletDropin": getBase64EncodedGzippedCustomScript(cgroupv2KubeletDropin, config), + "componentConfigDropin": getBase64EncodedGzippedCustomScript(componentConfigDropin, config), + "bindMountDropin": getBase64EncodedGzippedCustomScript(bindMountDropin, config), + "httpProxyDropin": getBase64EncodedGzippedCustomScript(httpProxyDropin, config), + "snapshotUpdateScript": getBase64EncodedGzippedCustomScript(snapshotUpdateScript, config), + "snapshotUpdateService": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdService, config), + "snapshotUpdateTimer": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdTimer, config), + "packageUpdateScriptMariner": getBase64EncodedGzippedCustomScript(packageUpdateScriptMariner, config), + "packageUpdateServiceMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdServiceMariner, config), + "packageUpdateTimerMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdTimerMariner, config), + "componentManifestFile": getBase64EncodedGzippedCustomScript(componentManifestFile, config), + "validateKubeletCredentialsScript": getBase64EncodedGzippedCustomScript(validateKubeletCredentialsScript, config), }, } diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh index 6bbf6c344c4..6739561d418 100644 --- a/vhdbuilder/packer/packer_source.sh +++ b/vhdbuilder/packer/packer_source.sh @@ -109,6 +109,8 @@ copyPackerFiles() { BLOCK_WIRESERVER_DEST=/opt/azure/containers/kubelet.sh ENSURE_IMDS_RESTRICTION_SRC=/home/packer/ensure_imds_restriction.sh ENSURE_IMDS_RESTRICTION_DEST=/opt/azure/containers/ensure_imds_restriction.sh + VALIDATE_KUBELET_CREDENTIALS_SCRIPT_SRC=/home/packer/validate-kubelet-credentials.sh + VALIDATE_KUBELET_CREDENTIALS_SCRIPT_DEST=/opt/azure/contains/validate-kubelet-credentials.sh RECONCILE_PRIVATE_HOSTS_SRC=/home/packer/reconcile-private-hosts.sh RECONCILE_PRIVATE_HOSTS_DEST=/opt/azure/containers/reconcilePrivateHosts.sh KUBELET_SERVICE_SRC=/home/packer/kubelet.service @@ -290,6 +292,7 @@ copyPackerFiles() { cpAndMode $KUBELET_SERVICE_SRC $KUBELET_SERVICE_DEST 600 cpAndMode $BLOCK_WIRESERVER_SRC $BLOCK_WIRESERVER_DEST 755 cpAndMode $ENSURE_IMDS_RESTRICTION_SRC $ENSURE_IMDS_RESTRICTION_DEST 755 + cpAndMode $VALIDATE_KUBELET_CREDENTIALS_SCRIPT_SRC $VALIDATE_KUBELET_CREDENTIALS_SCRIPT_DEST 755 cpAndMode $RECONCILE_PRIVATE_HOSTS_SRC $RECONCILE_PRIVATE_HOSTS_DEST 744 cpAndMode $SYSCTL_CONFIG_SRC $SYSCTL_CONFIG_DEST 644 cpAndMode $RSYSLOG_CONFIG_SRC $RSYSLOG_CONFIG_DEST 644 diff --git a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json index bb252c3809f..495efcb8590 100644 --- a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json +++ b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json @@ -184,6 +184,11 @@ "source": "parts/linux/cloud-init/artifacts/ensure_imds_restriction.sh", "destination": "/home/packer/ensure_imds_restriction.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh", + "destination": "/home/packer/validate-kubelet-credentials.sh" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/cse_redact_cloud_config.py", diff --git a/vhdbuilder/packer/vhd-image-builder-base.json b/vhdbuilder/packer/vhd-image-builder-base.json index 75a9a36d0ed..df8bd3892c7 100644 --- a/vhdbuilder/packer/vhd-image-builder-base.json +++ b/vhdbuilder/packer/vhd-image-builder-base.json @@ -187,6 +187,11 @@ "source": "parts/linux/cloud-init/artifacts/ensure_imds_restriction.sh", "destination": "/home/packer/ensure_imds_restriction.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh", + "destination": "/home/packer/validate-kubelet-credentials.sh" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/cse_redact_cloud_config.py", diff --git a/vhdbuilder/packer/vhd-image-builder-cvm.json b/vhdbuilder/packer/vhd-image-builder-cvm.json index 4a2fe2cf774..7192cd802d6 100644 --- a/vhdbuilder/packer/vhd-image-builder-cvm.json +++ b/vhdbuilder/packer/vhd-image-builder-cvm.json @@ -191,6 +191,11 @@ "source": "parts/linux/cloud-init/artifacts/ensure_imds_restriction.sh", "destination": "/home/packer/ensure_imds_restriction.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh", + "destination": "/home/packer/validate-kubelet-credentials.sh" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/cse_redact_cloud_config.py", diff --git a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json index a86e9bcdeab..908df909125 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json @@ -183,6 +183,11 @@ "source": "parts/linux/cloud-init/artifacts/ensure_imds_restriction.sh", "destination": "/home/packer/ensure_imds_restriction.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh", + "destination": "/home/packer/validate-kubelet-credentials.sh" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/cse_redact_cloud_config.py", diff --git a/vhdbuilder/packer/vhd-image-builder-mariner.json b/vhdbuilder/packer/vhd-image-builder-mariner.json index ac491ed5058..12fd6023e46 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner.json @@ -185,6 +185,11 @@ "source": "parts/linux/cloud-init/artifacts/ensure_imds_restriction.sh", "destination": "/home/packer/ensure_imds_restriction.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh", + "destination": "/home/packer/validate-kubelet-credentials.sh" + }, { "type": "file", "source": "parts/linux/cloud-init/artifacts/cse_redact_cloud_config.py", From 76cd11983599298bd27bad0ed7ac61fa2a950158 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Tue, 4 Mar 2025 15:41:48 -0800 Subject: [PATCH 02/19] chore: e2e msg --- e2e/validation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/validation.go b/e2e/validation.go index fb9abe0bbb2..e7991bd1445 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -41,7 +41,7 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { kubeletLogs := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not retrieve kubelet logs with journalctl").stdout.String() validatedKubeletCredentials := strings.Contains(kubeletLogs, "kubelet client credential is valid") || strings.Contains(kubeletLogs, "kubelet bootstrap token credential is valid") - require.True(s.T, validatedKubeletCredentials) + require.True(s.T, validatedKubeletCredentials, "expected kubelet to have validated its credential or bootstrap token before startup, but seemingly did not") // the instructions belows expects the SSH key to be uploaded to the user pool VM. // which happens as a side-effect of execCommandOnVMForScenario, it's ugly but works. From 28ac05cf5be600dcc43e9b3a0d0fcf7d31f06d37 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Tue, 4 Mar 2025 17:21:27 -0800 Subject: [PATCH 03/19] chore: fix copy path --- vhdbuilder/packer/packer_source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh index 6739561d418..cae092d4eeb 100644 --- a/vhdbuilder/packer/packer_source.sh +++ b/vhdbuilder/packer/packer_source.sh @@ -110,7 +110,7 @@ copyPackerFiles() { ENSURE_IMDS_RESTRICTION_SRC=/home/packer/ensure_imds_restriction.sh ENSURE_IMDS_RESTRICTION_DEST=/opt/azure/containers/ensure_imds_restriction.sh VALIDATE_KUBELET_CREDENTIALS_SCRIPT_SRC=/home/packer/validate-kubelet-credentials.sh - VALIDATE_KUBELET_CREDENTIALS_SCRIPT_DEST=/opt/azure/contains/validate-kubelet-credentials.sh + VALIDATE_KUBELET_CREDENTIALS_SCRIPT_DEST=/opt/azure/containers/validate-kubelet-credentials.sh RECONCILE_PRIVATE_HOSTS_SRC=/home/packer/reconcile-private-hosts.sh RECONCILE_PRIVATE_HOSTS_DEST=/opt/azure/containers/reconcilePrivateHosts.sh KUBELET_SERVICE_SRC=/home/packer/kubelet.service From 971f671bae02d65d42a99d0fe8d347158fe7e02f Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 09:13:18 -0800 Subject: [PATCH 04/19] chore: harden --- e2e/validation.go | 2 ++ .../artifacts/validate-kubelet-credentials.sh | 13 ++++++++++--- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 11 ++++++++--- .../AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 11 ++++++++--- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line315.sh | 11 ++++++++--- .../testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 11 ++++++++--- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line316.sh | 11 ++++++++--- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 11 ++++++++--- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 11 ++++++++--- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line321.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line321.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line314.sh | 11 ++++++++--- .../AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line314.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 11 ++++++++--- .../AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../AKSUbuntu1804+WithKubeletClientCert/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../AKSUbuntu1804Containerd+RuncVersion/line314.sh | 11 ++++++++--- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line321.sh | 11 ++++++++--- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../testdata/AKSUbuntu2204+CustomCloud/line315.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line314.sh | 11 ++++++++--- .../AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 11 ++++++++--- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 11 ++++++++--- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 11 ++++++++--- .../AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 11 ++++++++--- .../CustomData | 2 +- .../line322.sh | 11 ++++++++--- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 11 ++++++++--- .../AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../AKSUbuntu2204+SerializeImagePulls/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line314.sh | 11 ++++++++--- .../AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+ootcredentialprovider/line314.sh | 11 ++++++++--- .../CustomData | 2 +- .../line315.sh | 11 ++++++++--- .../testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 11 ++++++++--- .../testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu2404+Teleport/line314.sh | 11 ++++++++--- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 11 ++++++++--- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 11 ++++++++--- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 11 ++++++++--- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- .../CustomData | 2 +- .../line311.sh | 11 ++++++++--- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 11 ++++++++--- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 11 ++++++++--- 182 files changed, 822 insertions(+), 363 deletions(-) diff --git a/e2e/validation.go b/e2e/validation.go index e7991bd1445..a3bd5466043 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -41,7 +41,9 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { kubeletLogs := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not retrieve kubelet logs with journalctl").stdout.String() validatedKubeletCredentials := strings.Contains(kubeletLogs, "kubelet client credential is valid") || strings.Contains(kubeletLogs, "kubelet bootstrap token credential is valid") + validationFailed := strings.Contains(kubeletLogs, "kubelet credential validation failed") require.True(s.T, validatedKubeletCredentials, "expected kubelet to have validated its credential or bootstrap token before startup, but seemingly did not") + require.False(s.T, validationFailed, "expected kubelet credential validation to have succeeded") // the instructions belows expects the SSH key to be uploaded to the user pool VM. // which happens as a side-effect of execCommandOnVMForScenario, it's ugly but works. diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index c6eee679865..50835ea1b7b 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -19,8 +19,10 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + # for now we simply exit 0 here to prevent provisioning failures in cases where the credential + # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -35,6 +37,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -47,4 +54,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index fe6bac68bf5..d1cd25ecfdb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 861127a0046..1dced133317 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 861127a0046..1dced133317 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 1d55b59298d..9157d7a93b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 1d55b59298d..9157d7a93b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index fe6bac68bf5..d1cd25ecfdb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 794e3a6404b..36583081c7a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 3442d50e986..4ac9eea509d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index fe6bac68bf5..d1cd25ecfdb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 861127a0046..1dced133317 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index fe6bac68bf5..d1cd25ecfdb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index e872f0f98ed..c67a8b91388 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index bce9769c322..9f90112e185 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index e872f0f98ed..c67a8b91388 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index d1e2986c000..2a0e13802ac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 0404fa992bb..c02a5a132ad 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 690a0d9dbfe..7859da282a8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index c017031cf0e..c76f75c769c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index d1e2986c000..2a0e13802ac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index d1e2986c000..2a0e13802ac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 6a13aa28a5b..bfa2fd661d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 80530a70c3d..01f8714449b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index ba2522c2730..862d05edf14 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 0404fa992bb..c02a5a132ad 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 5d5be95fdd9..3f7c1157d39 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 5e561f24dd0..12295ac915c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index dcd4d9f42ad..e92afffbbb1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index aa61a4b6258..69342029c73 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index a5b1185e6f7..4a817ee2726 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 49d55b1c1f9..c04d3549c4b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 300c8cf5c2b..2383d78d04f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index e294681c910..0e63f377931 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index ecf3ac2f0dd..7b99e9d3e02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index ecf3ac2f0dd..7b99e9d3e02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index ecf3ac2f0dd..7b99e9d3e02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index c8bab64fa65..2adcf365446 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index ecf3ac2f0dd..7b99e9d3e02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index f6124973985..e07da99d919 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 876e5d24d08..2dac626d869 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 662961bb493..57d6cd2efff 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 0010ae5beb1..329fe15ed89 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 36901f8154d..d5b23f02df2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 736ac2e26c4..bd0ee282161 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 861127a0046..1dced133317 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index b0638d427a3..807f4b4380e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index a3318013a77..9f685f93ef6 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 8574ad32cfb..bb284d9cd54 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 8574ad32cfb..bb284d9cd54 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 8574ad32cfb..bb284d9cd54 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 8574ad32cfb..bb284d9cd54 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 8574ad32cfb..bb284d9cd54 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 78793cf4247..abe346d0c45 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 78793cf4247..abe346d0c45 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 197c30984a5..cb536558fb3 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 71a33ab58ac..0c37c4d8e93 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 71a33ab58ac..0c37c4d8e93 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 71a33ab58ac..0c37c4d8e93 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 71a33ab58ac..0c37c4d8e93 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 71a33ab58ac..0c37c4d8e93 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index fe6bac68bf5..d1cd25ecfdb 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 201d430dadf..f4922cfcfa1 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTTU/bQBC9768YthYnjEFVL644GOK2EYGgxFRFFK3W9hqvWHYt7zi0RfnvlU0+iGWHJJco2Zn35r038+nAi6X2Ym5zYgWCKyoDhSxExqUixJqqTAR4pkCP/6tK4SVGI5dalNYrSjOTVhrN3sqObQ6EXN6ehxfj62/D7+wmiH6cUee19ZfvejNeekrG3lMVCyWw+U6MzuTjnJLz8TiaRpPghnVg9T52oMbGoMWSF+4GPvkZjIaDIAobiFEYsYtJOAivo2EwmrKr4BebhNFkGE7PnNddS3339GS+HbiuvGODcBTcsWk9+eBDgo4W3/28E080vArHt9F+TK0m3/0yJySrdILSaJhxJVOO4nJlJrwSAABlEq5g7TErOOZnzilpXmUGB1AKLP8mzymTGatXqyoFOLuaC78boPrj7OvXnr0tB951N/JQAa8wh5fc8GcJ7rvFAuq0HKBfAXOhyQpCJLkButhOSEqRCo2Sq6Wztcm1OSKl654/EuG0+ZlJ0heHEnixgrOLWGQG93AAbgbUaR0LhQc4PFw/914VhYeFik0RscH8XeI+tBmA6xS6DtCHfjZIDWiDtWiLR1BpHisBaMAiLxEWzvWZs962l1wm+TKxzvmXadZsmal0egQvUimwT7KArQm12E/a7Pd9hnfO0ZAuk9xq6Jq34w5pf3Vr6ZQUekOZtG+AW3V1DbtvuG8EncN/0LMpYcULaJ6E7tYyJ0SZR8vQMDETGi3Q4HJ63H8zdMs9/Q8AAP//dacediUHAAA= + H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 6bc63721281..238f809aa83 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -18,8 +18,8 @@ function validateKubeconfig { $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ kubectl auth whoami --kubeconfig "$kubeconfig_path"; then - echo "kubelet credential validation failed" - exit 1 + echo "kubelet credential validation failed, will still attempt to start kubelet" + exit 0 fi } @@ -34,6 +34,11 @@ function validateKubeletCredentials { exit 0 fi + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami not supported, will skip kubelet credential validation" + exit 0 + fi + if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" @@ -46,4 +51,4 @@ function validateKubeletCredentials { echo "kubelet bootstrap token credential is valid" } -logs_to_events "AKS.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file +logs_to_events "AKS.Runtime.validateKubeletCredentials" validateKubeletCredentials \ No newline at end of file From 5c90dd42ab48c95ba453bc84b03265b07ffd44e3 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 09:28:13 -0800 Subject: [PATCH 05/19] chore: more hardening --- .../artifacts/validate-kubelet-credentials.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line315.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line314.sh | 16 ++++++++-------- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line315.sh | 16 ++++++++-------- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line315.sh | 16 ++++++++-------- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line316.sh | 16 ++++++++-------- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 16 ++++++++-------- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 16 ++++++++-------- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line321.sh | 16 ++++++++-------- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line321.sh | 16 ++++++++-------- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 16 ++++++++-------- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line322.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line321.sh | 16 ++++++++-------- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line315.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line322.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line322.sh | 16 ++++++++-------- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 16 ++++++++-------- .../AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../AKSUbuntu2204+SerializeImagePulls/line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line314.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line315.sh | 16 ++++++++-------- .../AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../AKSUbuntu2404+NetworkPolicy/line314.sh | 16 ++++++++-------- .../testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu2404+Teleport/line314.sh | 16 ++++++++-------- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 16 ++++++++-------- .../testdata/CustomizedImageKata/CustomData | 2 +- .../testdata/CustomizedImageKata/line309.sh | 16 ++++++++-------- .../testdata/MarinerV2+CustomCloud/CustomData | 2 +- .../testdata/MarinerV2+CustomCloud/line312.sh | 16 ++++++++-------- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- .../CustomData | 2 +- .../line311.sh | 16 ++++++++-------- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 16 ++++++++-------- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line314.sh | 16 ++++++++-------- 181 files changed, 818 insertions(+), 818 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 50835ea1b7b..b2be9667f2f 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -14,10 +14,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register @@ -32,16 +37,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index d1cd25ecfdb..5ef8b4d37fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 1dced133317..fa598b1c0fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 1dced133317..fa598b1c0fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 9157d7a93b5..56560715288 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 9157d7a93b5..56560715288 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index d1cd25ecfdb..5ef8b4d37fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 36583081c7a..e5158097388 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 4ac9eea509d..627bd028046 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index d1cd25ecfdb..5ef8b4d37fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 1dced133317..fa598b1c0fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index d1cd25ecfdb..5ef8b4d37fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index c67a8b91388..8d796a009da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 9f90112e185..1b3be4321df 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index c67a8b91388..8d796a009da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 2a0e13802ac..7ae6c58eb89 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index c02a5a132ad..d3fda2de992 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 7859da282a8..a8059997acd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index c76f75c769c..94cb87548fb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 2a0e13802ac..7ae6c58eb89 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 2a0e13802ac..7ae6c58eb89 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index bfa2fd661d3..5cf17db181b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 01f8714449b..7ba1db758d3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 862d05edf14..9d0da10abea 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index c02a5a132ad..d3fda2de992 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 3f7c1157d39..97b8d255d58 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 12295ac915c..f5283b35230 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index e92afffbbb1..9e77f832207 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 69342029c73..eb7438f1b13 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 4a817ee2726..d44acb3b118 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index c04d3549c4b..758903e5738 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 2383d78d04f..30947779fb5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 0e63f377931..b6bf5855161 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 7b99e9d3e02..05864d3d060 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 7b99e9d3e02..05864d3d060 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 7b99e9d3e02..05864d3d060 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 2adcf365446..0358180157d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 7b99e9d3e02..05864d3d060 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index e07da99d919..eb4f9d557c2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 2dac626d869..2c2e56415fc 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 57d6cd2efff..09152086586 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 329fe15ed89..29cc2500861 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index d5b23f02df2..2f585047262 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index bd0ee282161..621fe956cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 1dced133317..fa598b1c0fe 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 807f4b4380e..14d6cd6cf98 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 9f685f93ef6..90d9e4b2ec9 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index bb284d9cd54..906724a0aca 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index bb284d9cd54..906724a0aca 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index bb284d9cd54..906724a0aca 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index bb284d9cd54..906724a0aca 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index bb284d9cd54..906724a0aca 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index abe346d0c45..9161e4ffd2b 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index abe346d0c45..9161e4ffd2b 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index cb536558fb3..760c92d9d8e 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 0c37c4d8e93..12b8f6454d8 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 0c37c4d8e93..12b8f6454d8 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 0c37c4d8e93..12b8f6454d8 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 0c37c4d8e93..12b8f6454d8 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 0c37c4d8e93..12b8f6454d8 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index d1cd25ecfdb..5ef8b4d37fb 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index f4922cfcfa1..4e6c3575dac 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/6xUXU/bShB9318x7LXQvRLG5FZ9SQHJELeNCAQlpiqiyFrba7xis2t5x6Etyn+v7HxbdiBS85Ao3p1z5pw5438OnFAoJ2QmJYYj2LzQkImMJ0xIQowu8oiDozN02O8i506kFTKheG6cLNdTYYRWwfzasUmBkKu7C+9yePO5/yW4df2vZ9R6rT3q2s6U5Y4UofNchFxyrH4jrRLxNKPkYjj0x/7IvQ0asFoPG1BDrdFgzjJ7C598cwf9nut7FcTA84PLkdfzbvy+OxgH1+73YOT5o743PrNe33u1a3dOZruBy5v3Qc8buPfBuOy89yZBQ0nX/vAuHr9/7Q3v/P2YakVd++OMkKRQEQqtYMqkiBnyq5WZ8EoAAKSOmIS1x0HGMD2zOqQ6FQkcQM4x/xVN4kAkQRmtIudgvddc+FEBlR9rX7/2rK05sFFdyUMJrMAUXlLNJgLsjWABtWoO0E+AKVdkBcGjVANdpBOinMdcoWBy6WxpcmkOj4/gRUgJBstvhsgnGQJqMMhyhAUCXQP/FAgn1d9EkLaZSY6XK06zmJ1I4AEOwE6AWrWNovAIh4fr49bVo/C4kLqtNNSYbsSiC3UGYCqGpi3tQjsbxBqUxlK0wSMoFAslf8ucztKcdSRfUhGly7E29r8cecmW6EKtxvIsMtg5xrbRrNmfcp6BLYDOo0Th9PQUqPXvVsz+Pz/s/Efh3In51FGFlNWTnb1uxrPs2xRZpnPkf6/3h7awNPZVkS5TuDMMa96GFw1tv13bKim42lImzBxwp66mZvcN5pygsfk3arYlrHgB9TNXzVpmhEj9ZALUAZ9yhQaoezU+HhUKxYQft+893fFO+BMAAP//1n4O1Q4IAAA= + H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 238f809aa83..fe880e49f67 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -13,10 +13,15 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" + if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" + command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig "$kubeconfig_path"; then + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 @@ -29,16 +34,11 @@ function validateKubeletCredentials { exit 1 fi - if ! which kubectl; then + if ! which kubectl >/dev/null 2>&1; then echo "kubectl not found, will skip kubelet credential validation" exit 0 fi - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami not supported, will skip kubelet credential validation" - exit 0 - fi - if [ -f "$KUBECONFIG_PATH" ]; then echo "will validate kubeconfig: $KUBECONFIG_PATH" validateKubeconfig "$KUBECONFIG_PATH" From a9157325b56865f49edffe27c3d3e61701ea42b1 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 09:54:04 -0800 Subject: [PATCH 06/19] chore: commands --- .../artifacts/validate-kubelet-credentials.sh | 23 +++++++++++-------- .../AKSUbuntu1604+Containerd/CustomData | 2 +- .../AKSUbuntu1604+Containerd/line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line315.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line314.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line316.sh | 23 +++++++++++-------- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 23 +++++++++++-------- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line321.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line321.sh | 23 +++++++++++-------- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 23 +++++++++++-------- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line322.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../AKSUbuntu1804+HTTPProxy/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu1804+krustlet/CustomData | 2 +- .../AKSUbuntu1804+krustlet/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line321.sh | 23 +++++++++++-------- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line315.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 23 +++++++++++-------- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 23 +++++++++++-------- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line314.sh | 23 +++++++++++-------- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line322.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line322.sh | 23 +++++++++++-------- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../AKSUbuntu2204+cgroupv2/line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line314.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line315.sh | 23 +++++++++++-------- .../AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../AKSUbuntu2404+NetworkPolicy/line314.sh | 23 +++++++++++-------- .../AKSUbuntu2404+Teleport/CustomData | 2 +- .../AKSUbuntu2404+Teleport/line314.sh | 23 +++++++++++-------- .../testdata/AzureLinuxV2+Kata/CustomData | 2 +- .../testdata/AzureLinuxV2+Kata/line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 23 +++++++++++-------- .../testdata/CustomizedImageKata/CustomData | 2 +- .../testdata/CustomizedImageKata/line309.sh | 23 +++++++++++-------- .../testdata/MarinerV2+CustomCloud/CustomData | 2 +- .../testdata/MarinerV2+CustomCloud/line312.sh | 23 +++++++++++-------- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- .../CustomData | 2 +- .../line311.sh | 23 +++++++++++-------- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 23 +++++++++++-------- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line314.sh | 23 +++++++++++-------- 181 files changed, 1364 insertions(+), 909 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index b2be9667f2f..577688e47cb 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -9,21 +9,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register echo "kubelet credential validation failed, will still attempt to start kubelet" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 5ef8b4d37fb..720e3e6d353 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index fa598b1c0fe..0162c4f4463 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index fa598b1c0fe..0162c4f4463 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 56560715288..e15661d6d4c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 56560715288..e15661d6d4c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 5ef8b4d37fb..720e3e6d353 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index e5158097388..a9b4455d92a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 627bd028046..ef547df9a1d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 5ef8b4d37fb..720e3e6d353 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index fa598b1c0fe..0162c4f4463 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 5ef8b4d37fb..720e3e6d353 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 8d796a009da..e6cb796f571 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 1b3be4321df..95dd152b903 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 8d796a009da..e6cb796f571 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 7ae6c58eb89..f81ef12abb6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index d3fda2de992..e50b81b1c97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index a8059997acd..96e7043237b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 94cb87548fb..6c39d46574d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 7ae6c58eb89..f81ef12abb6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 7ae6c58eb89..f81ef12abb6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 5cf17db181b..2f3e8f7c792 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 7ba1db758d3..62d3d831953 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 9d0da10abea..db58bde0805 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index d3fda2de992..e50b81b1c97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 97b8d255d58..2ebda77a75a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index f5283b35230..4a93a813f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 9e77f832207..42c2b353eef 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index eb7438f1b13..fd75638a0ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index d44acb3b118..04291817d92 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 758903e5738..ebf05136df3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 30947779fb5..dd825f39fa7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index b6bf5855161..feea18966a9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 05864d3d060..3ba55a089b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 05864d3d060..3ba55a089b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 05864d3d060..3ba55a089b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 0358180157d..e0a5c2d02b1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 05864d3d060..3ba55a089b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index eb4f9d557c2..a2867631755 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 2c2e56415fc..76126cae21b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 09152086586..e705cba7fb5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 29cc2500861..819692d470d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 2f585047262..dbafa3428b2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 621fe956cc2..efe52286b50 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index fa598b1c0fe..0162c4f4463 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 14d6cd6cf98..d727bbb1f3a 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 90d9e4b2ec9..919ab1a599a 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 906724a0aca..813dcdec562 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 906724a0aca..813dcdec562 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 906724a0aca..813dcdec562 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 906724a0aca..813dcdec562 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 906724a0aca..813dcdec562 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 9161e4ffd2b..617e8646e23 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 9161e4ffd2b..617e8646e23 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 760c92d9d8e..1d67026c33b 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 12b8f6454d8..56f561a37f3 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 12b8f6454d8..56f561a37f3 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 12b8f6454d8..56f561a37f3 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 12b8f6454d8..56f561a37f3 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 12b8f6454d8..56f561a37f3 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 5ef8b4d37fb..720e3e6d353 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 4e6c3575dac..c8d49c3b506 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RUYW/iRhD97l8xca2olc7x0apfaDjJF9wWhYQInKpRG1mLPcajLLuud0zSRvz3yoZA4GwC+RAk7+x7M++92e/OvCkpbypMZhlkcLHUkFOOqSBpWUaXRYzg6Zw98V9ZoBdrxYIUFsbLC70gQ1pFq7ILk4FlXd9/Da5Gt78Ofovu/PD3nu287n3qut5CFJ6kqfdUTlEi17+xVinNlrb1dTQKJ+HYv4sasFoPG1CnWrPhQuTuDr71hz8c9P0wqCGGQRhdjYN+cBsO/OEkuvH/jMZBOB4Ek57zemxp1+18Xh4Griofon4w9B+iSdV5/0OChitd96ejeMLBTTC6D09j2rvUdX9eWlZaqphJK1gISYlgvN6ICa8WAIDUsZCw1TjKBWc9p2PVp7Gez4VKenZdwBJEyRk8Z1rMCdx31oCzBwFfvAQXniqltGsoSuEMZgXm4BLYKwgbLi8vwXa+34H/8ct55wf7HUD95RfgDFUNVf1hnGlobIsMKM1gyjzXBWPyCZ5JSigNQiyUSxAXKBghxoIppVgwGpopUrMC/ynRsAFShlEk9oatWYdj4U4TKiVrK1iBXPwbz5OI0qha67JAcI4NNvy9GcA5Nasn3t1LHzhrxdauNdgmkSvpElRMQr4FtMpqNefGNsPVf8GM85yBNRgWBcMaYesQvhDD5zcB26Ivka82nGa9ApTCX3AGbgq2s/cw2fAI5+fb49YXzIbHxoBONWfvtqsL+wwgVAJNj10X2tkg0XXG8YUMf4JSianEj8TpfJuu54zidXssT1q4ij3VpdrY9EQ5HLS1zaqtBS0GNPZRk745e1DgLW/DG2i3V+8lVRKqncnIrAAPztXU7Klmrwgam//gzu4IG15g/YSqeZalZUk9MxHrCBeo2IDtX08uxqVimuNF+y7ZB/bs/wAAAP//fXcebKkIAAA= + H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index fe880e49f67..63918bbe0aa 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -8,21 +8,26 @@ BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstr VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-5} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} function validateKubeconfig { local kubeconfig_path=$1 - command="kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null" - if ! grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - echo "kubectl auth whoami is not supported, will use can-i create certificatesigningrequests instead" - command="kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null" + if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null + code=$? + else + retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null + code=$? fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS $command; then - + if [ $code -ne 0 ]; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi From 978060d19bb7656b28800fc6d9d981eb2fe71e5b Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 09:57:12 -0800 Subject: [PATCH 07/19] chore: validation --- e2e/validation.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/validation.go b/e2e/validation.go index a3bd5466043..30c521418c0 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -40,10 +40,10 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { require.NotContains(s.T, stdout, "--dynamic-config-dir", "kubelet flag '--dynamic-config-dir' should not be present in /etc/default/kubelet\nContents:\n%s") kubeletLogs := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not retrieve kubelet logs with journalctl").stdout.String() - validatedKubeletCredentials := strings.Contains(kubeletLogs, "kubelet client credential is valid") || strings.Contains(kubeletLogs, "kubelet bootstrap token credential is valid") validationFailed := strings.Contains(kubeletLogs, "kubelet credential validation failed") - require.True(s.T, validatedKubeletCredentials, "expected kubelet to have validated its credential or bootstrap token before startup, but seemingly did not") require.False(s.T, validationFailed, "expected kubelet credential validation to have succeeded") + validatedKubeletCredentials := strings.Contains(kubeletLogs, "kubelet client credential is valid") || strings.Contains(kubeletLogs, "kubelet bootstrap token credential is valid") + require.True(s.T, validatedKubeletCredentials, "expected kubelet to have validated its credential or bootstrap token before startup, but seemingly did not") // the instructions belows expects the SSH key to be uploaded to the user pool VM. // which happens as a side-effect of execCommandOnVMForScenario, it's ugly but works. From 7f4d3fa35a8b3e5cbc0250fdcb52361503e874ac Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 16:45:09 -0800 Subject: [PATCH 08/19] chore: check apiserver connectivity before starting kubelet --- parts/linux/cloud-init/artifacts/cse_main.sh | 13 ++++++++----- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh | 13 ++++++++----- .../AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../AKSUbuntu1604+DynamicKubeletConfig/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh | 13 ++++++++----- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh | 13 ++++++++----- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line33.sh | 13 ++++++++----- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line33.sh | 13 ++++++++----- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDiskToggle/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+MIG/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../AKSUbuntu1804+Containerd+NSeriesSku/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../AKSUbuntu1804+Containerd+PrivateACR/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd+runcshimv2/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../testdata/AKSUbuntu1804+CustomCATrust/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh | 13 ++++++++----- .../AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../AKSUbuntu1804+WithKubeletClientCert/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../AKSUbuntu1804Containerd+RuncVersion/line33.sh | 13 ++++++++----- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../testdata/AKSUbuntu2204+Containerd+MIG/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../testdata/AKSUbuntu2204+CustomCloud/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOff/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeBlocked/line33.sh | 13 ++++++++----- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line33.sh | 13 ++++++++----- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOff/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOn/line33.sh | 13 ++++++++----- .../AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../AKSUbuntu2204+SecureTLSBoostrapping/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line33.sh | 13 ++++++++----- .../AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../AKSUbuntu2204+SerializeImagePulls/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh | 13 ++++++++----- .../AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+ootcredentialprovider/line33.sh | 13 ++++++++----- .../CustomData | 2 +- .../line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../testdata/AKSUbuntu2404+NetworkPolicy/line33.sh | 13 ++++++++----- .../testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line33.sh | 13 ++++++++----- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line28.sh | 13 ++++++++----- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line28.sh | 13 ++++++++----- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh | 13 ++++++++----- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- .../CustomData | 2 +- .../line32.sh | 13 ++++++++----- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line33.sh | 13 ++++++++----- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line33.sh | 13 ++++++++----- 181 files changed, 818 insertions(+), 545 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/cse_main.sh b/parts/linux/cloud-init/artifacts/cse_main.sh index 769411ec2b1..8f557a2069d 100755 --- a/parts/linux/cloud-init/artifacts/cse_main.sh +++ b/parts/linux/cloud-init/artifacts/cse_main.sh @@ -337,7 +337,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -401,6 +400,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -458,10 +464,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 720e3e6d353..c292d0fabc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 0162c4f4463..48a2a1c0fe5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 0162c4f4463..48a2a1c0fe5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index e15661d6d4c..7b758f8467c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index e15661d6d4c..7b758f8467c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 720e3e6d353..c292d0fabc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index a9b4455d92a..9c0f5e0a2da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index ef547df9a1d..d5687453446 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 720e3e6d353..c292d0fabc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 0162c4f4463..48a2a1c0fe5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 720e3e6d353..c292d0fabc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index e6cb796f571..7f804293e8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 95dd152b903..af0e5f4d301 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index e6cb796f571..7f804293e8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index f81ef12abb6..2a537d38850 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index e50b81b1c97..b973090beab 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 96e7043237b..3d99069aca3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 6c39d46574d..a58d82813c5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index f81ef12abb6..2a537d38850 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index f81ef12abb6..2a537d38850 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 2f3e8f7c792..0377d8950ba 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 62d3d831953..ac72e7125d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index db58bde0805..8c5898cc963 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index e50b81b1c97..b973090beab 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 2ebda77a75a..f4b5ea43bdb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 4a93a813f2d..1ee3a681cad 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 42c2b353eef..35af7c3477c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index fd75638a0ee..e26fb3df4b4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 04291817d92..8f4bf1ce90d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index ebf05136df3..30e259f563c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index dd825f39fa7..50960ddadee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index feea18966a9..3af5fee1bb0 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 3ba55a089b2..33487f9040e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 3ba55a089b2..33487f9040e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 3ba55a089b2..33487f9040e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index e0a5c2d02b1..9fae6662b8f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 3ba55a089b2..33487f9040e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index a2867631755..361855d8d5c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 76126cae21b..244cb6ff048 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index e705cba7fb5..b086dc51d1f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 819692d470d..69cb6d873ba 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index dbafa3428b2..55593cbe257 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index efe52286b50..17b5f18a6c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 0162c4f4463..48a2a1c0fe5 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line33.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index d727bbb1f3a..41feefa80a0 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line33.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 919ab1a599a..9714f1f7983 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line33.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 813dcdec562..7d825b63cb2 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 813dcdec562..7d825b63cb2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 813dcdec562..7d825b63cb2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 813dcdec562..7d825b63cb2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 813dcdec562..7d825b63cb2 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 617e8646e23..e7d6916b725 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -25,7 +25,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImage/line28.sh b/pkg/agent/testdata/CustomizedImage/line28.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/CustomizedImage/line28.sh +++ b/pkg/agent/testdata/CustomizedImage/line28.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 617e8646e23..e7d6916b725 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -25,7 +25,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImageKata/line28.sh b/pkg/agent/testdata/CustomizedImageKata/line28.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line28.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line28.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 1d67026c33b..b408831579f 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 56f561a37f3..f65b7b2f930 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line32.sh b/pkg/agent/testdata/MarinerV2+Kata/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line32.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 56f561a37f3..f65b7b2f930 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 56f561a37f3..f65b7b2f930 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 56f561a37f3..f65b7b2f930 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 56f561a37f3..f65b7b2f930 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz37Ag+8zi+YDT/WSmX+jJ5c8dhfzqRSdx45Pi96Xjqh+89p/8I96TXcWk/S8dkwugK8yh7z3AsvdOeh8c0HnVz/c8F7NksIyLzCUz5kgod25RqsDFapai22bn/itweLrbvFkkH8DyOOxHq/GKe/vIGmS9PX0Tm7MWr5ybsvHneQej56S8ISUvhN7w9y3j7aiX/z+sC7eVVmAmctDMiLWJ9nTiPmzsv8B/ffZU/SB5qs6ilyoTVc+TCGjp9K3DGbmh7Xve00WhYEycvCuhrS54deI7td1+dFlKuQEhRSfE9a+VXHhNMLlvPNoW3C2PnVF0ZV4e6un20hfgOdP8H/PenU/PN57//0ar/29y5VN/11Uofy9vxL05Pqxv/UDYOoX+do69cOT8Y6f6wr9Lld5tPdtkHTLE8SRFzeULpZZYawChvV5B8DHRA59WmXO+RfVcj97xjJD9+4Hfzy78bNVg5XsNu0w98ydTpfX6kOwMlZfcX3WofND1bGeYzo/P619brF63O8zetzmvjGahvAWxpsqrUfPjVDyvL6AqYlMBwPP4g48iiGHmPvSMx7sJVpF5VlMVZvnU7Wx/cnV/19ewaxn4Mxv0xeBL/iyc3T9/mt+KAWGIOKIkQUFMB5uREAJ6lKWUCxQCSmxVl6KjK8lqXelUtqlyT3Nitqg3f6Ss7JALm1b/rLPjlyxeqJqx3fx+YhDpC5OVVyt0bd5DPXsaSR3IaZSwB5pUMh2GEWJ6Ty/iJESQQb8tB3o5gK2ICLIVI+dt2+z7HbzcE8zCsxhFoHyXJXG3neF2H2nV2F2fp/zOdqsQS3+eerCp0H7opqy6FXeLoUgLS+bwAzuFSRtV7V1AUrQhd4NFF9F0XZNXbMRlnqoa0giSeSeo1XTn+OSaYL1GcL7SxAvipEEZzs+eyzeQJQzNKBWA6C4h/BnpA8kJojAAmoANWmGQCnWiqiqoWMCNg8GUmYvqVAJOBDvjJeFRsVvcCVEbyV6C2dfqhyLcuLUxdKwhst2/3w+lk4Fl9298Zfhef6bTw/H3H6+ocDKZC/lPZlSo5pohhGuPI2NHbbj6JMVN3RKQbqWK8M55utbGLEuUW2AZQXpp8/fLlIUi90dYkePt2khP59q3WNzO/yWIOMZcHQMf47QS8e/c4jAQKgUiMYnOaLhiM0dH41i8lZWQF+aV6rymGOLkpMs71iJlp5GUuWo8IqXbn/wUieXCxGjRqfAeS4l0r0yTUnCU0ujwWYRXfY5DXMVfXVj5og6qof3wz/DuYXfVmpBVYB+HXmql73WuFLPQRc0BoNdCa3YBLKGB+g/dn8BUniQKZoXzj45NNzd8OVza3Ir/oDWIyN8vGiEmowPMbSoq93oOAC5o+fnZuPZvzi7cqCwPYaIf6H/3AHvWC4XaH/xELaH39E+i3rih8v1Uqer6OktYv/Ok2DNBvM5Z+tSXDJ6DjIBBRQlAkMCVAveIDIhqjtwZobgYoe64cIBLXvzSp+djC02j8aI/P/jcAAP//qKkajDU+AAA= + H4sIAAAAAAAC/9w7a3PbOJLf9SswHO04yQ4lK6+ZZFbZYiRaZkWidCTluVwmx4JISMKaAhgAdOx1fL/9CgBJUTL1sCc3H05ViSWw0ehudKNf4I8/tGeYtGeQLxu254VnztAOf7eC3nkYOCN7PA26r0GDIwHM6waeg0/AnIM2TUUb/jtjqB1RIiAmiPF2yugV5piSVkRXaYIEAp9/A2KJSAOoD4qWFBhWwhCMbwCDBAgKeBZFiHOArrHAZNFqtYwC/BoLcNqY40ZjThnAABPQfMLRF9ABL16fnj79DcRUwWq6ODCatz3fDs/t4cT2fMXLxArO74wtQgBYMJQC8+wLOPkxh7bHZyd7EPz0E5gxBC8VhjleL9vEwERfFEH3VlEcNOvFqoBQwlEJzROEUtApVogpQQ2OYmBiYLQrZLZjYzehDU4zFqGjAfqOH3jjOrgGTMUKssvfrSEm2bW1QESAJU1i8FOjMRwPwr7jddtXkLUTusi1AV7yxuoyxgyYKWje5lB3jYTI7dkCjpKMC8TMtd4kdAH+yOVxCNiMODJpJtJMbM5b6+az1r84JXVPooRmsYkJFuYcJ4i3UniF4jrIq6WE4wImyVqtC7g1h+1GI70RS0peHDKOkKEYRiJUJIQRJXO8aKU3OU7T1KTpcTOFYplLAs801W1FDYkKJnIM4lqUKLRU9OQKidvwjcb0/dQNpqFnD23Lt7vNJwmfhQwlCHIETAZM/lTZ/CfQvN2EvQPdLjA6r1unLw3wuar3PIspgKkwF/LMuAEwE5ShFb1CIFoySm4a5VHQ/Od6Br/hAq0ikQCGuIBM5COxKfAK8RsSxeok0BOfxFCgpz83nywpFwSu0NOfgZoVZVzQFY8YTsW7d2orVo0tlXdcP7CGw4M2cRCuN3bPnMGGzWhpGc3bvuNb74d26Pvy9JDCEixDW7KKMYezBPn+Ofj2rXJaVCavmTZShq+gQAAtmDwwU0avbwCMY/ULc3DSvJ14zoUV2KE98GzfDyfe+D8/hla/L3/dnVTp88/H02E/Z2Hq2eF5EEz0hN30HjM77Fm7EciPVsCMITlnIpnoWZvsTyd9yUTPCnu2F/jVI7ecbIvIJleYUbJCRCgp7WGuN/WD8UhiDLypH+wmMKELHgoaoitEBAeG9cFv9Xy7Va7bUwrWgz3EBJ7jCApkgH1P97Mm6WZogblgN2FMVxCTUOpz12jejnpe6NmTse8EY+9j+N7y7bfmKmKtFY4Y5XQu5Il0Z+xEUDf+t/ZaTU0Cmrfvx+PADzxLbZ9yU72xG1iOa8vVB9IUPoa+7V3Y3t2mrHYt+wCMf/tb+9mdIaVwhRie34R91w+XCCby5KrDv2Unrh+e29YwOA/PLGdY4cto3o6nwfvx1JVqMBpZbv+uVpk1rNbcC8vz72o0Fl3BBDTXMFWFZEiwm2gVh3geziFOMobAq1PQAa9Ac5sC8O7dg93a83c/dTaZrmB1XcX3b40yjhA0i3KPwTLSppmY0YzEZrRE0aXJL3GaIn2Q7tJ0jkRvMrVYtDTA+ntx8rWRiNqUm7mTaJTuwenfgR+6wFhBJh2elKKMmTaeKZYTGUxsCVmfb570EpgswAoSM54pz2FmqTzqwTyBCyBddRkf7qJf+5oRJP2ZlQk6VfPPErg4wwkywN7HSjB/1jbAXvIog3xIF5iob2Eiv4ZfsViGl9kMJUiEOEZEYHFjgEMQYIeN3xmgOfVtL7R83xm4dj90+rYbOMHH0OmDZmC7lhvIr6Ve/VO7meuUMiEDfL6kWRKHUl9CcoVjDMOY4SvEeOP+WJjHR93mkxprCAkNuYCCg440i84pkLkGMKPrPas8bTAkus1/lkc6Q8JQOnRaqzpnECcolulEjARiK0yQtG+NFGikICczXxbMEMjtQSvU2sLcC6fvWGHfcy5srwgDKrphNG8Hk2nojvv2naaq8CRSohpgt5ge4XwSBMk0HUymfS0eA9wb2mvTRZyhIyoPcZpcodgA9eO78ZR+zopXmEy5tPP7Y1VFWiDhaLZHNEYWiXuS8CztFZGxs4ILxHeo3gwTyG7CSM9pNPwPziR877iW9zHsDW3LnU7+lNJt4n/aOJsOh2XY59n/MXU8u99tPjmSC2A0ayiUyZrjhxfnfQN8AwLiBJidxyu4DKvFEpXavKIxApDEIOcClEkHwIqqinYbSr1zuipnmTOyBrZvVFS8OfaVljbzsH/sh641sg0gD3WjWSuoB+t1zkIfpdwAlR9rd6aZH9AkRkSz85s2WukmYpQiEiMSYcSL6VBgSoy9xpBDlnvnZUSmGCUF2w901cNo3rq23ffXUutvGrLydhIssIf2ZOwFoe3KIH4L7BgfkRMSoARJq4gnSbbApCRwa1wxy5HI0p7r9DHjB1l3kfhK2eUW2o3RRsm144cfZMw8tIM6ThQj8gDClPDfIV91m0/+9UUmjyetCYwupQZ++gy+AY4SFIknLRXFSTSlnsbmV8hXJl/iFTeegm+gFdOvJKEwnnoOb8VoDrNEtKKMMUREq1js4vmnz60ECsTFhR46AUazNx5Nxq7tButahvFUJ1s50iGNlJZ8b2ILvMdRMfWGf4m0KuvtJ+xYc4kl2b5aHex+BoxmnbyNynguATlU1R+jsaFSforJh2yGjhUUTzGRcdJfqEgPJdEoaPxz6vPoZf9CrSloLFWlGAA1CrIG3lCS6vC2Vqxdljyq9IEb+nZP5vzB0A/LAH7iuIOdx9fOsCknwkdRxlAw9N9TKrhgMP2gI3H7GkXFKfoAYEW0Z0viyiBjDqXP21PeMnxVFSvCLekAB5NpHttyozY07QLJ7DoVOxSX/vAw/40IzxiqhqXbI5tVo3x/JIF9+8Lp2eFkOB04buichdK5al9Z0LyVhJdYRs6g5K8aemsWzTkwVJKalw/zv23NshmjKxwhM1X70OKIyZ81Kb/8lIXsByNsxcYGJoHQY5C0O6fmCi9CqUUCLW5U/G2Ad6Ado6s2yZIE/OMfJ/b47KTxydeTPjcqVbGuIWUl9T+wBx+7pkRmFsgAx2SRIKMh9VLpVrfytZ1x1k5oBJOcRtUlqiMXNKuLSG4b9visZD8vk+xTI1W4bdXhNoBR1oVtIlMVi8TaDurBNwol9/XMDywv0KWie92X3dTR9CBxfZ1IKepoWk9cUTXatAllrSqwPLPee04vHFmuNbC9/TVUPAeYj3SpZcysf2cMqSYNMJpj36jR5UMRoSL4DM4YjkaQwIXM7HY/e8ju5rKYq/mrAvehfd0Cv7+vKjf3t3f0nnh3HBZbEto6iyVU+ewgg/rMG+HFBDKBVf4B7o8V5O3vYRi2TOR2HfFbmUh/3Ptge+FwPHDcnb6NIwH+fp3HDtElYkAVlICZgaZve9o6PMftORNrGPaGjq1LQ2a657lv9zw7kJRY/yVdbdF22K6JGSUJ5vUxOVnuKeWfSCQWieU31SIotXE3SKMRMQQFkgMjSPAccdHHbC21c8svGgG+bXm987A/Hll7ZGc0b+vgq23hdzvafSofM3U3yuQIsmhp6grdjqpu3UK+VmzV29jvjPLKYNX/HC7i5KJUnoMsKpWczQfHYPqVV6f/yo+Y03OdauPEdSop5+TiddifWkNp3r0P+xLpI+KT/nlvcvW6sEn9qwgbjztED/KSF9CmHPXVHlelce/ZRsi6v6ZwNI/rDKzgcz0C1uWUA4JS50MpKPVrs+o5sn3fGtjh+CwMzu2wb33Mg8b7rZU9ktWVEnOumwkxmbdhJugKChwpkW5doyiuQPA2WmERXmEIumBFRVz9zUWMaXth7MKZ+/sDxa11FBnndqbbD6ZcrhXXxonwkuuu34iKWLcTJlAsu/ent9+8MeElL04FOVjBozs3RvN2B8K7akgZLVc0Bqe/vHp17Azlc0wEjMqFnz9IBIWWmCRGnmYHseUeXxfmdmjENzCDHL1+KcX4bo1/U5cCyxvYQdgbjqeF1itF6S0xgb2EZtviZkjAxajn6VrrGWUKchNpnmGcj/3AL9rz1sB2H93xneiee0+36c4pF6Vt1zzaMO2NJnQYeJbrTyxPus/z6cAOJ9bAfrC1l6dKwCDhKZTJ+nm2QBO4qLaha57uIc3/3Zoon/Z4cvyvMNX9tXtDdcfdwBtPJxfPd663M1+65+dkihQtGM3Sq+e16ZHMRXYkRx+m7+2hVEFFTng2tAZ+18zRmTrq6uYEGCqpedTJXXpuxdC6jrdhR5IW1w7CwB5NhlZg11vRerKSBEEiFGiVJlAgfco9RnrrwqJcz5wncPHwRLOUZSmPUp5Ml9FNhr5kiAt1n4dmott5tQLmevkSDpE4pZiIbkbw9dt2WzWyK5yvv7Y4jS7BegW9c7yb89viCY7QBnye75cZauGtfgAcra4Q69GVNBugN8Rz7cD2Q5loOGP3rWmctk5bp8YdMDqt57+0TrcTrUcKvqT/O4k+9KZu4IxstQPdGhF3GVpRURFDnpdUA+UCa9/xP4TBx4n9nYx1hkm8ohkRu611SrD43PDQlwwzxLtyhqmn5Jga1lwgVvegMNL9gY5/wyORFIGO/tV4QJun7hCtKP506IycwN8hsH33LkpNnSZ4hUU1jLz3bKvy6cs8zB2H/elE5mPjkeP3puOpH773nP4jPI2WjUv7WTomE0ZXmEfZe4Zj6Wj2PDymh6j75H8u9s5mGRGZT2DKl1ToMKXc0Y3RKkW1fcv9t932cLF9TUie5c/juBOhzi/m6S9vkPny9EVkzl68em7CzpvnHYSen/6CkFR6fsPbs4y3r1by/zzFby+vwkzgpJ0Rqdzrm8F5CNx5gf/47qv8QfKomUUtVfGrHgkX1tDpW4EzdkPb87qnjUbDmjh5fq9vIHl24Dm23311Wki5AiFFJcX3rJXfXkwwuWw92xTeLoydU3X7W53P6iLRFuI70P0f8N+fTs03n//+R6v+b3PnUn3XVyt9LC+6vzg9rW78Q9k4hP51jr5ye/xg0PrDvqKV320+2WUfMMXyUETM5Qmll1lqAKO8KEHyMdABnVebcr1H9l2N3PPmj/z4gd/N7/FulFPleA27TT/wJVOn9/mRngmUlN1fdKsT0PRsZZjPjM7rX1uvX7Q6z9+0Oq+NZ6C+mr+lyaro8uFXP6wso4tZUgLD8fiDDAmLuuI99o7EuAtXkUVVURZn+dZFa31wd37VN61rGPsxGPfH4En8L57cPH2bX3ADYok5oCRCQE0FmJMTAXiWppQJFANIblaUoaOKxGtd6lW1qHLjcWO3qjZ8p2/fkAiYV/+us+CXL1+o8q7e/X1gEuoIkZe3Indv3EE+exlLHslplLEEmFcysoURYnl6LUMhRpBAvC0HeTuCrYgJsBQi5W/b7fscv90QzMOwGkegfZQkc7Wd43VJadfZXZyl/890an0b35o4QHMggzSCIoEpAeqeLYhojN6C5iZm3aLdHgUmQWDzzSFdFN4EOyKqzau2RRCU//zON3RVif3QHV11He0SR5cSkM7nBXAOlzKq3viComiC6NKSLt/vupqr3svJOFPVqxUk8UxSr+nK8c8xwXyJ4nyhjRXAT0Uc2Nzs9mwzecLQjFIBmM4/4p+BHpC8EBojgAnogBUmmUAnmqqingbMCBh8mYmYfiXAZKADfjIeFUrWvXqVkfzlq20TfCjyresSU9cKAtvt2/1wOhl4Vt/2d2YLxWc6LQKVvuN1dfYHUyH/qbxOFTtTxDCNcWTs6Ko3n8SYqdsp0utVMd4ZT7ca6EVxdAtsAygvir5++fIQpN5oaxK8fTvJiXz7Vuubmd+hMYeYSxvrGL+dgHfvHoeRQCEQiVFsTtMFgzE6Gt/6daiMrCC/VG9UxRAnN0Wuux4xM428zILrESHVaP2/QCTPWVaDRo3vQFK85WWahJqzhEaXxyKs4nsM8jrm6hraB21QtROOb8N/B7Or3sm0Ausg/FozdZd9rZCFPmIOCK3GhbMbcAkFzO8O/wy+4iRRIDOUb3x8sqn529HV5lbkV8xBTOZm2ZIxCRV4fkNJsdd7EHBB08fPzq1nc37xPmdhABuNWP+jH9ijXjDcvlvwiAW0vv4J9FuXI77fKhU9Xwd16+BGN4CAfo+y9KstY8/VBUTi+pcvf7THZ/8bAAD//xjIV5BmPgAA - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 720e3e6d353..c292d0fabc4 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntu/line33.sh b/pkg/agent/testdata/RawUbuntu/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/RawUbuntu/line33.sh +++ b/pkg/agent/testdata/RawUbuntu/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index c8d49c3b506..b1a26d8e9d0 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line33.sh b/pkg/agent/testdata/RawUbuntuContainerd/line33.sh index 3912ec0cf67..b0fac58c91b 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line33.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line33.sh @@ -292,7 +292,6 @@ if [ "${NEEDS_CONTAINERD}" == "true" ] && [ "${SHOULD_CONFIG_CONTAINERD_ULIMITS logs_to_events "AKS.CSE.setContainerdUlimits" configureContainerdUlimits fi -logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi @@ -346,6 +345,13 @@ else logs_to_events "AKS.CSE.apiserverNC" "retrycmd_if_failure ${API_SERVER_CONN_RETRIES} 1 10 nc -vz ${API_SERVER_NAME} 443" || time nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR=$ERR_K8S_API_SERVER_CONN_FAIL fi +echo "API server connection check code: $VALIDATION_ERR" +if [ $VALIDATION_ERR -ne 0 ]; then + exit $VALIDATION_ERR +fi + +logs_to_events "AKS.CSE.ensureKubelet" ensureKubelet + if [[ ${ID} != "mariner" ]] && [[ ${ID} != "azurelinux" ]]; then echo "Recreating man-db auto-update flag file and kicking off man-db update process at $(date)" createManDbAutoUpdateFlagFile @@ -390,10 +396,7 @@ else fi fi -echo "Custom script finished. API server connection check code:" $VALIDATION_ERR +echo "Custom script finished." echo $(date),$(hostname), endcustomscript>>/opt/m -exit $VALIDATION_ERR - - #EOF \ No newline at end of file From a7997c5215a91ff80f7faf1ddf9d695d19bbb904 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Wed, 5 Mar 2025 17:16:33 -0800 Subject: [PATCH 09/19] chore: use kubectl version for validation --- .../artifacts/validate-kubelet-credentials.sh | 20 +++++-------------- .../AKSUbuntu1604+Containerd/CustomData | 2 +- .../AKSUbuntu1604+Containerd/line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 20 +++++-------------- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line315.sh | 20 +++++-------------- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line314.sh | 20 +++++-------------- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line316.sh | 20 +++++-------------- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 20 +++++-------------- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line321.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line321.sh | 20 +++++-------------- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 20 +++++-------------- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line322.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../AKSUbuntu1804+HTTPProxy/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu1804+krustlet/CustomData | 2 +- .../AKSUbuntu1804+krustlet/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line321.sh | 20 +++++-------------- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line315.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 20 +++++-------------- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 20 +++++-------------- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line314.sh | 20 +++++-------------- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line322.sh | 20 +++++-------------- .../CustomData | 2 +- .../line322.sh | 20 +++++-------------- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../AKSUbuntu2204+cgroupv2/line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line314.sh | 20 +++++-------------- .../CustomData | 2 +- .../line315.sh | 20 +++++-------------- .../AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../AKSUbuntu2404+NetworkPolicy/line314.sh | 20 +++++-------------- .../AKSUbuntu2404+Teleport/CustomData | 2 +- .../AKSUbuntu2404+Teleport/line314.sh | 20 +++++-------------- .../testdata/AzureLinuxV2+Kata/CustomData | 2 +- .../testdata/AzureLinuxV2+Kata/line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 20 +++++-------------- .../testdata/CustomizedImageKata/CustomData | 2 +- .../testdata/CustomizedImageKata/line309.sh | 20 +++++-------------- .../testdata/MarinerV2+CustomCloud/CustomData | 2 +- .../testdata/MarinerV2+CustomCloud/line312.sh | 20 +++++-------------- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- .../CustomData | 2 +- .../line311.sh | 20 +++++-------------- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 20 +++++-------------- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line314.sh | 20 +++++-------------- 181 files changed, 545 insertions(+), 1455 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 577688e47cb..fbe851b8696 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -14,21 +14,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register echo "kubelet credential validation failed, will still attempt to start kubelet" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index c292d0fabc4..37f1065598f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 48a2a1c0fe5..8f5fd751b22 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 48a2a1c0fe5..8f5fd751b22 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 7b758f8467c..85565f42044 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 7b758f8467c..85565f42044 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index c292d0fabc4..37f1065598f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 9c0f5e0a2da..03eaf655460 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index d5687453446..5345eae3372 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index c292d0fabc4..37f1065598f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 48a2a1c0fe5..8f5fd751b22 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index c292d0fabc4..37f1065598f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 7f804293e8c..9c7c4344cd8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index af0e5f4d301..635299148af 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 7f804293e8c..9c7c4344cd8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 2a537d38850..59cb8419aba 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index b973090beab..13f76419695 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 3d99069aca3..338171f9d40 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index a58d82813c5..4b2cf31aec4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 2a537d38850..59cb8419aba 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 2a537d38850..59cb8419aba 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 0377d8950ba..9d42e420303 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index ac72e7125d5..0327aec4f97 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 8c5898cc963..fd1313808c7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index b973090beab..13f76419695 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index f4b5ea43bdb..317671015a2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 1ee3a681cad..de4924ca0fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 35af7c3477c..f0c50f729cf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index e26fb3df4b4..4c0d09e708e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 8f4bf1ce90d..5d55183abbf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 30e259f563c..b4c7c08c823 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 50960ddadee..c39d8977a98 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 3af5fee1bb0..bcf57fce349 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 33487f9040e..96c6625014f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 33487f9040e..96c6625014f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 33487f9040e..96c6625014f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 9fae6662b8f..545b61e1d44 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 33487f9040e..96c6625014f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 361855d8d5c..455c48f40f0 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 244cb6ff048..bfea816a796 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index b086dc51d1f..f61b16d14ca 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 69cb6d873ba..6d15d0310ce 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 55593cbe257..5b012d1e7be 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 17b5f18a6c4..e8ff2e4c8ae 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 48a2a1c0fe5..8f5fd751b22 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 41feefa80a0..2095a6ea755 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 9714f1f7983..c4e8f365a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 7d825b63cb2..aae1f0b5dec 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 7d825b63cb2..aae1f0b5dec 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 7d825b63cb2..aae1f0b5dec 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 7d825b63cb2..aae1f0b5dec 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 7d825b63cb2..aae1f0b5dec 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index e7d6916b725..57f1f823003 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index e7d6916b725..57f1f823003 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index b408831579f..ddcc160b6d1 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index f65b7b2f930..67c1cc9893e 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index f65b7b2f930..67c1cc9893e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index f65b7b2f930..67c1cc9893e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index f65b7b2f930..67c1cc9893e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index f65b7b2f930..67c1cc9893e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index c292d0fabc4..37f1065598f 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index b1a26d8e9d0..0f832f3eb8c 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+RU0U7bShB991cMvha6V8KY3L6lhMoQt40IBCWmKmqRtbbH8YrNrusdh7aIf6/sgEMsO0D7WD8ksnfnnJlzZuafHSfk0gmZTg2NBDYWCjKeYcK4MAytijxCcFRGDvtZ5OhEShLjEnPtZLlacs2VDFbX9nUKhnF6eeydTM7fjz4EF67/cWBad41PfdtZstwRPHRuihAFUvUfKZnw+b1pHE8m/syfuhdBC1bnYQtqqBRpyllmb+Abn9zxaOj6XgUx9vzgZOoNvXN/5I5nwZn7OZh6/nTkzQbW3Uuv9u3ewf124PLmVTD0xu5VMCszHz5L0BLSt9+8iMcfnXmTS/91TI2gistIChkRVxKWTPCYEZ7WYsKdAQAgVMQErDUOMkbpwOoZ1SlPYJ5jBjYH8zZVbMFNODw8BNP6twohAaygFP4/2u39Z8KRE+PSkYUQ1Ze3QCnKCqh8cqT8R7SIA54EZYsWOYL1UpPga41TPtZrtf+N+IaiDYSN+lfagP2kWcFqiPpEnRooUjEOrHfVOwqNf4NWEZM2hyhHRggR5sQTHjFCzeeSy3mO3wrUpP9MzITXDfwFrPIEbIlwANeNpsQoVWA+bJ0yqxglcSYeJ6YcntIAjPfglgsBmspfRoSLjIAUaGI5wQOCuQb+zgkOHpPpmkWBdFJz6oeZrJLeATsB02psShOuYXd3fdy5Us2OSkNF6ZNx70OTAZiMoW379qGbDWIFUlFZtKY9KCQLBT4nTq/p1A7cpjxK63bZvk7WzpV3S/ZEFbK26YZnsNXWLqvWFnQY0JpHRfro7FaB17wtS9nsvt3oVMFRblTG9Qpwa11tyb7W7BVBa/LPxGyWUPMCqRuU7bXcG4ZQcx2QCnCJkjSY7ulsf1pI4gvc754lc8uc/QoAAP//S2RfIjoJAAA= + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 63918bbe0aa..e67775797eb 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -13,21 +13,11 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 - if grep -i "whoami" <<< "$(kubectl auth 2>&1)" >/dev/null 2>&1; then - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami --kubeconfig $kubeconfig_path >/dev/null - code=$? - else - retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig $kubeconfig_path >/dev/null - code=$? - fi - - if [ $code -ne 0 ]; then + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 fi From fc44cf7597c7383c63183c307561f7885c6c496d Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Thu, 6 Mar 2025 09:31:56 -0800 Subject: [PATCH 10/19] chore: don't silence --- .../linux/cloud-init/artifacts/validate-kubelet-credentials.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/CustomData | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 2 +- .../CustomData | 2 +- .../line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../CustomData | 2 +- .../line311.sh | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 2 +- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 2 +- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 2 +- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 2 +- 181 files changed, 181 insertions(+), 181 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index fbe851b8696..9b0310a8149 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -17,7 +17,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 37f1065598f..20cbcb144f4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 8f5fd751b22..a4efd3b9f0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 8f5fd751b22..a4efd3b9f0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 85565f42044..76aaa515ddc 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 85565f42044..76aaa515ddc 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 37f1065598f..20cbcb144f4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 03eaf655460..da22b088937 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 5345eae3372..0b9495a7a1e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 37f1065598f..20cbcb144f4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 8f5fd751b22..a4efd3b9f0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 37f1065598f..20cbcb144f4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 9c7c4344cd8..787a75978fd 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 635299148af..1465739e1ac 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 9c7c4344cd8..787a75978fd 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 59cb8419aba..feb85d3a819 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 13f76419695..81da982581e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 338171f9d40..faf30fef5da 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 4b2cf31aec4..9de689259dd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 59cb8419aba..feb85d3a819 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 59cb8419aba..feb85d3a819 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 9d42e420303..bca5553ece5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 0327aec4f97..b0a8e1144d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index fd1313808c7..dc01b83ea89 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 13f76419695..81da982581e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 317671015a2..803c41f9268 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index de4924ca0fe..744f1cf026e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index f0c50f729cf..c76648a100e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 4c0d09e708e..0b57814cee2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 5d55183abbf..9ce97f1d8af 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index b4c7c08c823..2c8c2261f68 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index c39d8977a98..634804efa63 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index bcf57fce349..1499c8c7e3d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 96c6625014f..70d551c52a6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 96c6625014f..70d551c52a6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 96c6625014f..70d551c52a6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 545b61e1d44..02662a9d7ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 96c6625014f..70d551c52a6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 455c48f40f0..c79f7f6949e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index bfea816a796..d535be2642f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index f61b16d14ca..0b790a3fd22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 6d15d0310ce..6656aacb194 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 5b012d1e7be..e888304cdaf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index e8ff2e4c8ae..6f95bca2c31 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 8f5fd751b22..a4efd3b9f0c 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 2095a6ea755..658c239cc75 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index c4e8f365a55..7ceb45026fd 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index aae1f0b5dec..b1cc377c649 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index aae1f0b5dec..b1cc377c649 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index aae1f0b5dec..b1cc377c649 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index aae1f0b5dec..b1cc377c649 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index aae1f0b5dec..b1cc377c649 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 57f1f823003..19e01a9659c 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 57f1f823003..19e01a9659c 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index ddcc160b6d1..d0e46a0aff6 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 67c1cc9893e..b8dd23d61a5 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 67c1cc9893e..b8dd23d61a5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 67c1cc9893e..b8dd23d61a5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 67c1cc9893e..b8dd23d61a5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 67c1cc9893e..b8dd23d61a5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 37f1065598f..20cbcb144f4 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 0f832f3eb8c..7b63e8d63de 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AWlEC1fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrtv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2Hn6aOnYHR09bweuKm/YJJj5N2xZ3XzyLkFPy9j99CGecHoRzK/D3Zg6TTWXlZYqJqEVrLgUCSc8b8yEJwsAQOqYS2g9Zjmn7NgZWfWpSGEPCqTiT/yQMJGyarTKAsH5qLnwqwaqPs6ufu3Y23HgVXctjySssKhmHtxXQwW201Fvw4mX4MpTpZSfgTJUDVDzB+NMg/0yrBAXmKAiweXG6Iql8gqTA3gUUoKh6psT4UNOQBoM8YLgBcFugX8LgqP6MRXWUIQS6azhNC9RihR+wh64KdhOZ8FsuIX9/fZ4cBNtuO1IXiuNNGWvpmQMXQbgKoG+pR3DMBskGpSmSrShAygVjyS+Z85oY047oY+ZiLMm5TY9+P9kf9SrZ1Nbsae6VE1M9yKHrbEORdVGMBBA7z1q0k2yWw1ueXt22R6u7kyqFKjeKBNmDbhVV99ldw17TdB7+Xd63kpoeIH0Pap+Lc+WJfWdYaQZrlCRAds/Xx4uSkXiAQ+Hd8nesmf/AgAA//91kvyzcQcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index e67775797eb..15811ae77cb 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" >/dev/null; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From edaf0ffbd74c1be9337e6c0e45a401e7117cc155 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Thu, 6 Mar 2025 10:39:13 -0800 Subject: [PATCH 11/19] chore: catch stderr --- .../linux/cloud-init/artifacts/validate-kubelet-credentials.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/CustomData | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 2 +- .../CustomData | 2 +- .../line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../CustomData | 2 +- .../line311.sh | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 2 +- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 2 +- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 2 +- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 2 +- 181 files changed, 181 insertions(+), 181 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 9b0310a8149..6ab0ba6ba6b 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -17,7 +17,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 20cbcb144f4..f864237093c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index a4efd3b9f0c..c250a0994f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index a4efd3b9f0c..c250a0994f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 76aaa515ddc..01ba7a8cef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 76aaa515ddc..01ba7a8cef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 20cbcb144f4..f864237093c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index da22b088937..fb3f89e225a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 0b9495a7a1e..742ee635642 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 20cbcb144f4..f864237093c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index a4efd3b9f0c..c250a0994f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 20cbcb144f4..f864237093c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 787a75978fd..32a30924b79 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 1465739e1ac..82e4556aa37 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 787a75978fd..32a30924b79 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index feb85d3a819..6b0e1a2f92f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 81da982581e..d108fc7eb5a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index faf30fef5da..d721a026fda 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 9de689259dd..3e5a15b8daf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index feb85d3a819..6b0e1a2f92f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index feb85d3a819..6b0e1a2f92f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index bca5553ece5..9406e8d4636 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index b0a8e1144d0..588eef5d9f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index dc01b83ea89..2a9395b5232 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 81da982581e..d108fc7eb5a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 803c41f9268..e5024bd0d9a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 744f1cf026e..5d01ef75770 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index c76648a100e..67302138260 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 0b57814cee2..0b9b07b5b41 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 9ce97f1d8af..442525a14d3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 2c8c2261f68..71350cd4b07 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 634804efa63..59ee87f2dec 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 1499c8c7e3d..3c735354346 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 70d551c52a6..fa593feab1e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 70d551c52a6..fa593feab1e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 70d551c52a6..fa593feab1e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 02662a9d7ee..a189f92be31 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 70d551c52a6..fa593feab1e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index c79f7f6949e..2fc056f9b74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index d535be2642f..6494f26246d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 0b790a3fd22..a0625045244 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 6656aacb194..22f28484745 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index e888304cdaf..83dd85dcb24 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 6f95bca2c31..e4dd1d70c83 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index a4efd3b9f0c..c250a0994f9 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 658c239cc75..2d40da7a8f6 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 7ceb45026fd..2b1e8da18a7 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index b1cc377c649..384fc2a34b7 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index b1cc377c649..384fc2a34b7 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index b1cc377c649..384fc2a34b7 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index b1cc377c649..384fc2a34b7 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index b1cc377c649..384fc2a34b7 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 19e01a9659c..35621fc629f 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 19e01a9659c..35621fc629f 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index d0e46a0aff6..2dc4a69115b 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index b8dd23d61a5..2116d611d7c 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index b8dd23d61a5..2116d611d7c 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index b8dd23d61a5..2116d611d7c 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index b8dd23d61a5..2116d611d7c 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index b8dd23d61a5..2116d611d7c 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 20cbcb144f4..f864237093c 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 7b63e8d63de..d7dce6b7ffe 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNQ7n4Ey1E138wfjzIDzMqEQF5igJinU2t0KujIIkwN4lEqBpepbEOFDTkAGLImC4AXB2QD/lgRH9WMqWV9uCums4bQv+ckUfsIeuCk4g9ZWOXAL+/ub4971c+C2JXmlNDKUvRqNEbQZQOgEujZ1BP1skBjQhirRlg6g1CJS+J45w7U5m7F8zGScNdGeeAkuPV0qBf+f7A879axrK/bUlLqJ6V7msDXWvqg2EfQE0HmPmnSd7FaDN7wdC+z0V7cmVUnUb5RJuwLcqqvrsruGvSLovPw7PW8lNLxA5h51t5ZnxpS5s5wMxyVqsuD454vDealJPuBh/y45W/bsXwAAAP//jPHYGmYHAAA= + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 15811ae77cb..acb4075cf02 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From 79a4c7a1da8b19c58319015c95b2ac8f8a5e2b71 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Thu, 6 Mar 2025 11:15:25 -0800 Subject: [PATCH 12/19] chore: typo --- .../linux/cloud-init/artifacts/validate-kubelet-credentials.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/CustomData | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 2 +- .../CustomData | 2 +- .../line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../CustomData | 2 +- .../line311.sh | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 2 +- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 2 +- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 2 +- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 2 +- 181 files changed, 181 insertions(+), 181 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 6ab0ba6ba6b..7d76e9d9c95 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -17,7 +17,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index f864237093c..f0a2ab18e30 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index c250a0994f9..6987d2c3919 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index c250a0994f9..6987d2c3919 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 01ba7a8cef5..d38a1b093ba 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 01ba7a8cef5..d38a1b093ba 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index f864237093c..f0a2ab18e30 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index fb3f89e225a..41b35cf4cb0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 742ee635642..b6954c9f03e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index f864237093c..f0a2ab18e30 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index c250a0994f9..6987d2c3919 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index f864237093c..f0a2ab18e30 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 32a30924b79..8888160be50 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 82e4556aa37..1b0da0e3332 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 32a30924b79..8888160be50 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 6b0e1a2f92f..78c60ba840d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index d108fc7eb5a..b3bea5ef712 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index d721a026fda..6a5354467f2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 3e5a15b8daf..1cfa8b2aecc 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 6b0e1a2f92f..78c60ba840d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 6b0e1a2f92f..78c60ba840d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 9406e8d4636..3d19a939ec4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 588eef5d9f0..ff1c9f61fa4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 2a9395b5232..6a8e8d05fec 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index d108fc7eb5a..b3bea5ef712 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index e5024bd0d9a..c1b0c8b3e3f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 5d01ef75770..f32da7eae7e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 67302138260..064585ab5fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 0b9b07b5b41..2f3319e462b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 442525a14d3..c2025d84466 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 71350cd4b07..8d055b1bfd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 59ee87f2dec..efd9129ab0d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 3c735354346..7010b77e2c0 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index fa593feab1e..0a1aa3e663a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index fa593feab1e..0a1aa3e663a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index fa593feab1e..0a1aa3e663a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index a189f92be31..5c25ffebc4d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index fa593feab1e..0a1aa3e663a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 2fc056f9b74..5bf4ebc2f32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 6494f26246d..2d72a739913 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index a0625045244..cea51401fc3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 22f28484745..8ed345270a9 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 83dd85dcb24..68e178a3604 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index e4dd1d70c83..e295d86ae70 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index c250a0994f9..6987d2c3919 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 2d40da7a8f6..b999ba7a8b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 2b1e8da18a7..87d3606bc4e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 384fc2a34b7..da4f0e43e0a 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 384fc2a34b7..da4f0e43e0a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 384fc2a34b7..da4f0e43e0a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 384fc2a34b7..da4f0e43e0a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 384fc2a34b7..da4f0e43e0a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 35621fc629f..bd5de89a842 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 35621fc629f..bd5de89a842 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 2dc4a69115b..9fdcf0e014e 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 2116d611d7c..8303eb44856 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 2116d611d7c..8303eb44856 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 2116d611d7c..8303eb44856 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 2116d611d7c..8303eb44856 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 2116d611d7c..8303eb44856 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index f864237093c..f0a2ab18e30 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index d7dce6b7ffe..c43cc0b2d36 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+It4wph8fUsFkiFuGxEISkxV1KLT2V7jE8ed5VuHtoj/XtkhDlh2IHlIYt/uzM3M7n97XiS1FwmbMYsELpYGcpljKqRizJqyiBE8k5Mn/pYFerHRJKTGwnp5YZbSSqP5quzQZsDY+fVpcDa7/DL5yq/88NuxM3hqvRq53lIUnpKRd19GqJDq39joVN49O+x0NgsX4dy/4h1YvYcdqJExZKkQufsGn333p5OxHwY1xDQI+dk8GAeX4cSfLviF/4PPg3A+CRbHg6ePlo7c4dHzduCq8oaPg6l/wxfVzcfvEnS0jNxPH+IJJxfB7DrcjanVVHOxtNQxSaNhKZRMBOF5YyY8MQAAZWKhYOMxzwVlx4Mhq09lCntQIBV/4oeEy5RXo1UWCIOPmgu/aqDqM9jVrx17Ww686q7lkYIlFtXMg/tqqMAZtNTD/yf7Q+czUIa6gWj+YJwZcF7GFOICE9QkhVpbXOFXLmFyAI9SKbBUfQsifMgJyIAlURC8IDgb4N+S4Kh+TCXrC08hnTWc9iVEmcJP2AM3BWfQWi0HbmF/f3Pcu4MO3LYkr5RGhrJX8zGCNgMInUDXuo6gnw0SA9pQJdrSAZRaRArfM2e4Nmczm4+ZjLMm3xMvwaWnS6XqDDv1rGsr9tSUuonpXuawNda+qDYR9ATQeY+adJ3sVoM3vB1b7PRXtyZVSdRvlEm7Atyqq+uyu4a9Iui8/Ds9byU0vEDmHnW3lmfGlLmznAzHJWqy4Pjni8N5qUk+4GH/Ljlb9uxfAAAA//87CBBcawcAAA== + H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index acb4075cf02..653364ea73c 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path 2>&1"; then + kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From f89d9c04223f19e6126db5c6d695c90808a3cfb5 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Thu, 6 Mar 2025 11:38:30 -0800 Subject: [PATCH 13/19] chore: modify params: --- .../cloud-init/artifacts/validate-kubelet-credentials.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 6 +++--- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 6 +++--- .../testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 6 +++--- .../testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 6 +++--- .../testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 6 +++--- .../testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 6 +++--- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 6 +++--- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 6 +++--- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 6 +++--- .../CustomData | 2 +- .../line321.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 6 +++--- .../CustomData | 2 +- .../line315.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../CustomData | 2 +- .../line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 6 +++--- .../CustomData | 2 +- .../line322.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 6 +++--- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 6 +++--- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 6 +++--- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 6 +++--- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 6 +++--- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 6 +++--- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 6 +++--- .../CustomData | 2 +- .../line311.sh | 6 +++--- .../CustomData | 2 +- .../line311.sh | 6 +++--- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 6 +++--- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 6 +++--- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 6 +++--- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 6 +++--- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 6 +++--- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 6 +++--- .../CustomData | 2 +- .../line311.sh | 6 +++--- .../CustomData | 2 +- .../line311.sh | 6 +++--- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 6 +++--- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 6 +++--- 181 files changed, 363 insertions(+), 363 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 7d76e9d9c95..15c66bea352 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -7,9 +7,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index f0a2ab18e30..14cf362e2df 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 6987d2c3919..07eb961dfc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 6987d2c3919..07eb961dfc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index d38a1b093ba..f49e1a79cd1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index d38a1b093ba..f49e1a79cd1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index f0a2ab18e30..14cf362e2df 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 41b35cf4cb0..c65fc48a4d9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index b6954c9f03e..01a6c27c6b9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index f0a2ab18e30..14cf362e2df 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 6987d2c3919..07eb961dfc4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index f0a2ab18e30..14cf362e2df 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 8888160be50..19a810357dd 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 1b0da0e3332..f277f045172 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 8888160be50..19a810357dd 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 78c60ba840d..0cd94d0c0f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index b3bea5ef712..92a0d3c7a42 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 6a5354467f2..16c55f37d02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 1cfa8b2aecc..31c9aa3ce68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 78c60ba840d..0cd94d0c0f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 78c60ba840d..0cd94d0c0f9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 3d19a939ec4..8d96c8b1b4d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index ff1c9f61fa4..a55c8a93977 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 6a8e8d05fec..18107fec649 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index b3bea5ef712..92a0d3c7a42 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index c1b0c8b3e3f..e625f73fbf9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index f32da7eae7e..5268697032d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 064585ab5fe..d2ae0b43bec 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 2f3319e462b..8c1147f7f57 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index c2025d84466..53cf247c6cd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 8d055b1bfd6..a7f057cd790 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index efd9129ab0d..e6a69f9b788 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 7010b77e2c0..dcd7a0670b1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 0a1aa3e663a..40dd741ee16 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 0a1aa3e663a..40dd741ee16 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 0a1aa3e663a..40dd741ee16 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 5c25ffebc4d..97593a7fcbf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 0a1aa3e663a..40dd741ee16 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 5bf4ebc2f32..df52ab20062 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 2d72a739913..f07f80b5eed 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index cea51401fc3..f43141b8c60 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 8ed345270a9..9003c5d7d97 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 68e178a3604..e02b9516dd6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index e295d86ae70..ed7bf3ca2f7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 6987d2c3919..07eb961dfc4 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index b999ba7a8b5..0b977854e76 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 87d3606bc4e..8f16d716cc2 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index da4f0e43e0a..8ae0e928b50 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index da4f0e43e0a..8ae0e928b50 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index da4f0e43e0a..8ae0e928b50 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index da4f0e43e0a..8ae0e928b50 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index da4f0e43e0a..8ae0e928b50 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index bd5de89a842..cf6c496d4e1 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index bd5de89a842..cf6c496d4e1 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 9fdcf0e014e..cab2d97f62a 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 8303eb44856..990d0d11c6a 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 8303eb44856..990d0d11c6a 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 8303eb44856..990d0d11c6a 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 8303eb44856..990d0d11c6a 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 8303eb44856..990d0d11c6a 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index f0a2ab18e30..14cf362e2df 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index c43cc0b2d36..a3c5a8f9f68 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR951dc+YhPIvbbt240QcvuNlZrWtys2TWTAS4ycZwhzKXurvG/b6AKSqC2fWgLc+85c8659789LxLKi7jJLIMELpYacpFjyoW0LKPLIkbwdE4e/1sW6MVaERcKC+PlhV4JI7Ri67JDk4FlnV+fBmfzyy/Tr+zKD78d285T59XY9Va88KSIvPsyQolU/8ZapeLu2bZO5/NwGS78K9aDNXjYgxppTYYKnrvv8K3v/mw68cOghpgFITtbBJPgMpz6syW78H+wRRAupsHy2HnatnTsjo6eNwNXlTdsEsz8G7asbj75kKCnZex+2oonnF4E8+twN6ZOU81lpaWKSWgFKy5FwgnPGzPhyQIAkDrmElqPWc4pO3ZGVn0qUtiDAqn4Ez8kTKSsGq2yQHC2NRd+1UDVx9nVrx17Ow686a7lkYQVFtXMg/tmqMB2Oupt+P9kf/QZKEPVQDR/MM402C9jCnGBCSoSXL5aXOFXLmFyAI9CSjBUfXMifMgJSIMhXhC8INgt8G9BcFQ/psIaCk8inTWc5iVEkcJP2AM3BdvprJYNt7C/3x4P7qANtx3Ja6WRpuzNfIyhywBcJdC3rmMYZoNEg9JUiTZ0AKXikcSPzBm9mtPO5mMm4qzJ98RLcOWpUsq+CNvkqtqKPdWlamK6FzlsjHUoqjaCgQB671GTvia70eCWt2eL7eHqzqRKgeqdMmHWgBt19V1217DXBL2X/6DnvYSGF0jfo+rX8mxZUt8ZRprhChUZsP3z5eGiVCQe8HB4l+wNe/YvAAD//26rLVNrBwAA + H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 653364ea73c..b784731b98b 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -6,9 +6,9 @@ source /opt/azure/containers/provision_source.sh KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" -VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-10} -VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-3} -VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-3} +VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES=${VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES:-30} +VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS:-1} +VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS:-10} function validateKubeconfig { local kubeconfig_path=$1 From 2ff7b9415cb2d15ef50ef862eec452973e269ab8 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Thu, 6 Mar 2025 12:44:00 -0800 Subject: [PATCH 14/19] chore: xtrace --- .../linux/cloud-init/artifacts/validate-kubelet-credentials.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 15c66bea352..705f5707b83 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euo pipefail xtrace # this gives us logs_to_events and retry wrappers source /opt/azure/containers/provision_source.sh From e0a8fb1a8296057aca6a553c808001f050cb7900 Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Fri, 7 Mar 2025 13:30:25 -0800 Subject: [PATCH 15/19] chore: opts --- .../cloud-init/artifacts/validate-kubelet-credentials.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 4 ++-- .../CustomData | 2 +- .../line315.sh | 4 ++-- .../CustomData | 2 +- .../line315.sh | 4 ++-- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh | 4 ++-- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 4 ++-- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 4 ++-- .../testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 4 ++-- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 4 ++-- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh | 4 ++-- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 4 ++-- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 4 ++-- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line315.sh | 4 ++-- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 4 ++-- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 4 ++-- .../CustomData | 2 +- .../line315.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 4 ++-- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh | 4 ++-- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../CustomData | 2 +- .../line314.sh | 4 ++-- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 4 ++-- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 4 ++-- .../CustomData | 2 +- .../line322.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 4 ++-- .../testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 4 ++-- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 4 ++-- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 4 ++-- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 4 ++-- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 4 ++-- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 4 ++-- .../CustomData | 2 +- .../line311.sh | 4 ++-- .../CustomData | 2 +- .../line311.sh | 4 ++-- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 4 ++-- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 4 ++-- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 4 ++-- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 4 ++-- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 4 ++-- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 4 ++-- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh | 4 ++-- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 4 ++-- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 4 ++-- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 4 ++-- 181 files changed, 272 insertions(+), 272 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 705f5707b83..fd9a769c4fd 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail xtrace +set -euxo pipefail # this gives us logs_to_events and retry wrappers source /opt/azure/containers/provision_source.sh @@ -17,7 +17,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 14cf362e2df..a7812324145 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 07eb961dfc4..6f2ddc354a1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 07eb961dfc4..6f2ddc354a1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index f49e1a79cd1..a68b11bc8c9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index f49e1a79cd1..a68b11bc8c9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 14cf362e2df..a7812324145 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index c65fc48a4d9..ce17b9b25c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 01a6c27c6b9..278b97d0a1d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 14cf362e2df..a7812324145 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 07eb961dfc4..6f2ddc354a1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 14cf362e2df..a7812324145 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 19a810357dd..55e45988103 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index f277f045172..8620b198812 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 19a810357dd..55e45988103 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 0cd94d0c0f9..56bd636b494 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 92a0d3c7a42..c590eb6e236 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 16c55f37d02..5894f4b4bab 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 31c9aa3ce68..c4317d3b104 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 0cd94d0c0f9..56bd636b494 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 0cd94d0c0f9..56bd636b494 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 8d96c8b1b4d..2ca70fd2d96 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index a55c8a93977..a551176fd7b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 18107fec649..3549af54aaf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 92a0d3c7a42..c590eb6e236 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index e625f73fbf9..e1d21a2ccd4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 5268697032d..679fc8c157c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index d2ae0b43bec..ce01e96fd6c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 8c1147f7f57..ce05476f2c5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 53cf247c6cd..4b54a1ff6c3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index a7f057cd790..0b7d5b420e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index e6a69f9b788..d718c65c2cb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index dcd7a0670b1..0ba78cf3707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 40dd741ee16..60afe3bbade 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 40dd741ee16..60afe3bbade 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 40dd741ee16..60afe3bbade 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 97593a7fcbf..ae98b99d627 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 40dd741ee16..60afe3bbade 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index df52ab20062..f4cf25fa68a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index f07f80b5eed..88d36988317 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index f43141b8c60..473f0269721 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 9003c5d7d97..9ff86dc7c05 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index e02b9516dd6..2a27517ca14 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index ed7bf3ca2f7..3cc80c124af 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 07eb961dfc4..6f2ddc354a1 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 0b977854e76..275f1d1af35 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 8f16d716cc2..c9120b7146b 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 8ae0e928b50..a2d84511b90 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 8ae0e928b50..a2d84511b90 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 8ae0e928b50..a2d84511b90 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 8ae0e928b50..a2d84511b90 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 8ae0e928b50..a2d84511b90 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index cf6c496d4e1..ceb42071775 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index cf6c496d4e1..ceb42071775 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index cab2d97f62a..0b90efef9d6 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 990d0d11c6a..1e79baa965b 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 990d0d11c6a..1e79baa965b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 990d0d11c6a..1e79baa965b 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 990d0d11c6a..1e79baa965b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 990d0d11c6a..1e79baa965b 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 14cf362e2df..a7812324145 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index a3c5a8f9f68..232490044ca 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU+jTBR9n19x5SM+idhv37rRBC2721itaXGzZteQAS4ycZwhzKXurul/30AVlEC1fWgLc+85c8659789NxLKjbjJmEECB0sNucgx5UIyZnRZxAiuzsnlf8sC3Vgr4kJhYdy80CthhFbhpuzQZMDY+fWpfza//DL9Gl55wbdjy37qvBo77ooXrhSRe19GKJHq31irVNytLXY6nwfLYOFdhT1Yg4c9qJHWZKjgufMGn333ZtOJF/g1xMwPwrOFP/Evg6k3W4YX3o9w4QeLqb88tp8+Wjp2Ph2ttwNXlTfhxJ95N+GyuvnkXYKelrEz+hBPML3w59fBbkydprEzOlozlpYqJqEVrLgUCSc8b9yEJwYAIHXMJbQmhzmn7NgesfpUpLAHBVLxJ35IQpGG1WyVBYL9UXfhVw1UfexdDduxt2PBq+5aHklYYVENPTivpgosu6Pegv9P9kefgTJUDUTzB+NMg/U8pxAXmKAiweWLxRV+5RImB/AopARD1TcnwoecgDQY4gXBM4LVAv8WBEf1YyrYUHgS6azhNM8hihR+wh44KVh2Z7csuIX9/fZ4cAktuO1I3iiNNGWv5mMMXQbgKoG+fR3DMBskGpSmSrShAygVjyS+Z87oxZx2Nh8zEWdNvidugitXlVL2RdgmV9VW7KkuVRPTvchha6xDUbURDATQe4+a9CXZrQa3vD1bbA1XdyZVClRvlAmzAdyqq++yu4a9Iei9/Ds9byU0vED6HlW/ljVjUt+ZkHSIK1RkwPLOl4eLUpF4wMPhXbK27Nm/AAAA//81uOmdbAcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index b784731b98b..40abc8067d1 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail source /opt/azure/containers/provision_source.sh @@ -16,7 +16,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path" 2>&1; then + kubectl version --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From 064bd97dc4f244728aabd2d1f877633a01c4847a Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Fri, 7 Mar 2025 13:37:41 -0800 Subject: [PATCH 16/19] chore: fix opts --- .../cloud-init/artifacts/validate-kubelet-credentials.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 6 ++++-- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 6 ++++-- .../testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 6 ++++-- .../testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 6 ++++-- .../testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 6 ++++-- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 6 ++++-- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 6 ++++-- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 6 ++++-- .../CustomData | 2 +- .../line321.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 6 ++++-- .../CustomData | 2 +- .../line315.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../CustomData | 2 +- .../line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 6 ++++-- .../CustomData | 2 +- .../line322.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 6 ++++-- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 6 ++++-- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 6 ++++-- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 6 ++++-- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 6 ++++-- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 6 ++++-- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 6 ++++-- .../CustomData | 2 +- .../line311.sh | 6 ++++-- .../CustomData | 2 +- .../line311.sh | 6 ++++-- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 6 ++++-- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 6 ++++-- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 6 ++++-- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 6 ++++-- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 6 ++++-- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 6 ++++-- .../CustomData | 2 +- .../line311.sh | 6 ++++-- .../CustomData | 2 +- .../line311.sh | 6 ++++-- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 6 ++++-- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 6 ++++-- 181 files changed, 454 insertions(+), 272 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index fd9a769c4fd..eac0f546f2b 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -1,8 +1,10 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail # this gives us logs_to_events and retry wrappers -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index a4b412137fb..b5a262c7af4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index b607d4a163b..f8f4b29c300 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index b607d4a163b..f8f4b29c300 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 8fa72515556..49f2f434129 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 8fa72515556..49f2f434129 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index a4b412137fb..b5a262c7af4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index cec08d810a1..7591794c958 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 78c2a52e9a5..e5744ba6edc 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index a4b412137fb..b5a262c7af4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index b607d4a163b..f8f4b29c300 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index a4b412137fb..b5a262c7af4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 9b91bc332f6..300d7a87a4e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index b526f3da441..f5f4185d414 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 9b91bc332f6..300d7a87a4e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 73aadd2fa26..e750dbe240f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index a4ce3bd4c1c..0a990dc5c02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index eefda1db382..ed7bb12289e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 2c7bff049ef..b26c2a23a4b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 73aadd2fa26..e750dbe240f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 73aadd2fa26..e750dbe240f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 26eb37dbbb7..d8b4d2f0356 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 27f275362b1..01ea488d955 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index a8b21c3a696..7dfc45bf1dc 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index a4ce3bd4c1c..0a990dc5c02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 902a929c39e..815c1bcbe00 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index e3e679cd159..453a4c49842 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 6db6be2065f..963fbbc0a39 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 2ccbfabeb24..80c4fcd3d99 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 515fc81de94..b35bb5129e3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 9802f5f48ba..a91861cac95 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 918ff62b644..da33421da90 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index cec7ba22b28..a5b56f44a55 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 5a6ff591d2c..452df421d93 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 5a6ff591d2c..452df421d93 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 5a6ff591d2c..452df421d93 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 4e1e78aba80..cc874f821ac 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 5a6ff591d2c..452df421d93 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 69ef633f3ea..5916f159107 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 7c7ff1f5735..b5985859471 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 166467557f5..39b89f847ea 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index cdbb6241a9d..9901da46932 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index e9f662ca55c..952f4821289 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index cca2b0079fe..dc489c569ab 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index b607d4a163b..f8f4b29c300 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index d018a6c8124..7d43ce0a6b7 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 48b73f63896..5a0882735f8 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 898654540d7..2d0f74ec40c 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 898654540d7..2d0f74ec40c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 898654540d7..2d0f74ec40c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 898654540d7..2d0f74ec40c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 898654540d7..2d0f74ec40c 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 85222ffcdc1..b172fa3a9cb 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 85222ffcdc1..b172fa3a9cb 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 48289550e3e..7b659266e79 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index afdd28f6a74..0ab4cc0ef8e 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index afdd28f6a74..0ab4cc0ef8e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index afdd28f6a74..0ab4cc0ef8e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index afdd28f6a74..0ab4cc0ef8e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index afdd28f6a74..0ab4cc0ef8e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index a4b412137fb..b5a262c7af4 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 58816712fd6..dd67dd7eea7 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGD5ZOGXOSYciEZM7osYgRX5+Tyf2WBbqwVcaGwMG5e6IUwQqtwVXZoMmDs/PrUP5tefht/D6+84MexZT+3Xg0dd8ELV4rIvS8jlEj1b6xVKu6WFjudToN5MPOuwg6s3sMO1EhrMlTw3HmDz356k/HIC/waYuIH4dnMH/mXwdibzMML71c484PZ2J8f288fLR06X46W24Gryptw5E+8m3Be3Xz0LkFHy9AZfIgnGF/40+tgN6ZW09AZHC0ZS0sVk9AKFlyKhBOeN27CMwMAkDrmEjYmhzmn7NgesPpUpLAHBVLxN35IQpGG1WyVBYL9UXfhTw1UfexdDduxt2XBq+5aHklYYFENPTivpgosu6Xe+gqUoWq6mz8YZxqslxGFuMAEFQku1+5W0JVBmBzAo5ASDFXfnAgfcgLSYIgXBC8I1gb4SRAc1Y+pYH25SaSzhtO85CdS+A174KRg2a21suAW9vc3x737Z8FtS/JKaaQpezUaQ2gzAFcJdK3qEPrZINGgNFWiDR1AqXgk8T1zBmtzNmP5mIk4a6I9cRNcuKqUEj6f7A869axrK/ZUl6qJ6V7ksDXWvqg2EfQE0HmPmnSd7FaDN7wdC2z1V7cmVQpUb5QJswLcqqvrsruGvSLovPw7PW8lNLxA+h5Vt5YlY1LfmZB0iAtUZMDyzueHs1KReMDD/l2ytuzZ/wAAAP//eg2camgHAAA= + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 40abc8067d1..d64cca2c707 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -1,7 +1,9 @@ #!/bin/bash -set -euxo pipefail +set -euo pipefail -source /opt/azure/containers/provision_source.sh +source /opt/azure/containers/provision_source.sh + +set -x KUBECONFIG_PATH="${KUBECONFIG_PATH:-/var/lib/kubelet/kubeconfig}" BOOTSTRAP_KUBECONFIG_PATH="${BOOTSTRAP_KUBECONFIG_PATH:-/var/lib/kubelet/bootstrap-kubeconfig}" From ba082314ba57e89dce41be2ab454cc9c1a6cb7de Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Fri, 7 Mar 2025 14:39:48 -0800 Subject: [PATCH 17/19] chore: cani --- .../artifacts/validate-kubelet-credentials.sh | 13 ++++++++++++- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line315.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 4 +++- .../AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 4 +++- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 4 +++- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 4 +++- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 4 +++- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line315.sh | 4 +++- .../testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 4 +++- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line316.sh | 4 +++- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 4 +++- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 4 +++- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line314.sh | 4 +++- .../CustomData | 2 +- .../line321.sh | 4 +++- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line314.sh | 4 +++- .../CustomData | 2 +- .../line321.sh | 4 +++- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 4 +++- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 4 +++- .../AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 4 +++- .../AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 4 +++- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line314.sh | 4 +++- .../AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 4 +++- .../testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line314.sh | 4 +++- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line314.sh | 4 +++- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 4 +++- .../AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../AKSUbuntu1804+WithKubeletClientCert/line314.sh | 4 +++- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../AKSUbuntu1804Containerd+RuncVersion/line314.sh | 4 +++- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 4 +++- .../CustomData | 2 +- .../line321.sh | 4 +++- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../testdata/AKSUbuntu2204+CustomCloud/line315.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../CustomData | 2 +- .../line314.sh | 4 +++- .../AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 4 +++- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 4 +++- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 4 +++- .../testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 4 +++- .../testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 4 +++- .../AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 4 +++- .../CustomData | 2 +- .../line322.sh | 4 +++- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 4 +++- .../AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../AKSUbuntu2204+SerializeImagePulls/line314.sh | 4 +++- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line314.sh | 4 +++- .../AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+ootcredentialprovider/line314.sh | 4 +++- .../CustomData | 2 +- .../line315.sh | 4 +++- .../testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 4 +++- .../testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu2404+Teleport/line314.sh | 4 +++- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 4 +++- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 4 +++- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 4 +++- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- .../CustomData | 2 +- .../line311.sh | 4 +++- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 4 +++- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 4 +++- 181 files changed, 372 insertions(+), 181 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index eac0f546f2b..6b9891acca4 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -16,10 +16,21 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + # if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + # $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + # $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + # kubectl version --kubeconfig "$kubeconfig_path"; then + + # # for now we simply exit 0 here to prevent provisioning failures in cases where the credential + # # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register + # echo "kubelet credential validation failed, will still attempt to start kubelet" + # exit 0 + # fi + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index b5a262c7af4..1e669d1a23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index f8f4b29c300..ef3afa63a8e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index f8f4b29c300..ef3afa63a8e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 49f2f434129..82012b2092e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 49f2f434129..82012b2092e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index b5a262c7af4..1e669d1a23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 7591794c958..42e5abff42f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index e5744ba6edc..9dc1d269523 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index b5a262c7af4..1e669d1a23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index f8f4b29c300..ef3afa63a8e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index b5a262c7af4..1e669d1a23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 300d7a87a4e..a0210aa1a33 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index f5f4185d414..577dbf6fa58 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 300d7a87a4e..a0210aa1a33 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index e750dbe240f..a5d0c2dec8d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 0a990dc5c02..521dcaefa0d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index ed7bb12289e..00ad2aae3a3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index b26c2a23a4b..7f2ad580ae4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index e750dbe240f..a5d0c2dec8d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index e750dbe240f..a5d0c2dec8d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index d8b4d2f0356..0879b5809a5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 01ea488d955..bcbed2fd23c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 7dfc45bf1dc..9cbf9cdcee9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 0a990dc5c02..521dcaefa0d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 815c1bcbe00..639806e69a9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 453a4c49842..d23011f4684 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 963fbbc0a39..eaa2b24eab9 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 80c4fcd3d99..41be4519947 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index b35bb5129e3..09053d59528 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index a91861cac95..a0b33715048 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index da33421da90..4fd234a78e4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index a5b56f44a55..39648e43305 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 452df421d93..3abc25c0cbd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 452df421d93..3abc25c0cbd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 452df421d93..3abc25c0cbd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index cc874f821ac..5b6fdaf9562 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 452df421d93..3abc25c0cbd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 5916f159107..604aa3609e1 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index b5985859471..8a9420e5970 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 39b89f847ea..6dfa4154530 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 9901da46932..023d6b5cd7e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 952f4821289..29ccef670e5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index dc489c569ab..f10c96c2db2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index f8f4b29c300..ef3afa63a8e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 7d43ce0a6b7..a72928daba7 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 5a0882735f8..8950de50d8d 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 2d0f74ec40c..6b237df537a 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 2d0f74ec40c..6b237df537a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 2d0f74ec40c..6b237df537a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 2d0f74ec40c..6b237df537a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 2d0f74ec40c..6b237df537a 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index b172fa3a9cb..9765a29a3c5 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index b172fa3a9cb..9765a29a3c5 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 7b659266e79..27a22fa2149 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 0ab4cc0ef8e..3550ffe0e5d 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 0ab4cc0ef8e..3550ffe0e5d 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 0ab4cc0ef8e..3550ffe0e5d 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 0ab4cc0ef8e..3550ffe0e5d 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 0ab4cc0ef8e..3550ffe0e5d 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index b5a262c7af4..1e669d1a23c 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index dd67dd7eea7..a2dcf8c0768 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjEn7lgokQ9w2IhCUmKqoRdbZXuMTx53lWwdalH+v7BAHLDuQPCSxb3fmZmb3054bCeVG3GTMIIGDpYZc5JhyIRkzuixiBFfn5PJ/ZYFurBVxobAwbl7ohTBCq3BVdmgytgJ5Yuz8+tQ/m15+G38Pr7zgx7FlP7deDR13wQtXisi9LyOUSPVvrFUq7pYWO51Og3kw867CDqzeww7USGsyVPDceYPPfnqT8cgL/Bpi4gfh2cwf+ZfB2JvMwwvvVzjzg9nYnx/bzx8tHTpfjpbbgavKm3DkT7ybcF7dfPQuQUfL0Bl8iCcYX/jT62A3plbT0BkcLRlLSxWT0AoWXIqEE543bsIzAwCQOuYSNiaHOafs2B6w+lSksAcFUvE3fkhCkYbViJUFgv1Rd+FPDVR97F0N27G3ZcGr7loeSVhgUc0+OK+mCiy7pd76CpSharqbPxhnGqyXEYW4wAQVCS7X7lbQlUGYHMCjkBIMVd+cCB9yAtJgiBcELwjWBvhJEBzVj6lgfblJpLOG07zkJ1L4DXvgpGDZrbWy4Bb29zfHvftnwW1L8kpppCl7NRpDaDMAVwl0reoQ+tkg0aA0VaINHUCpeCTxPXMGa3M2Y/mYiThroj1xE1y4qpQSPp/sDzr1rGsr9lSXqonpXuSwNda+qDYR9ATQeY+adJ3sVoM3vB0LbPVXtyZVClRvlAmzAtyqq+uyu4a9Iui8/Ds9byU0vED6HlW3liVjUt+ZkHSIC1RkwPLO54ezUpF4wMP+XbK27Nn/AAAA//9sWyrzbgcAAA== + H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index d64cca2c707..89229f074b5 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -15,10 +15,12 @@ VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS=${VALIDATE_KUBELET_CREDENTIAL function validateKubeconfig { local kubeconfig_path=$1 + + if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl version --kubeconfig "$kubeconfig_path"; then + kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From 581f058850815d630862f62892d910a2e770c80a Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Fri, 7 Mar 2025 15:54:31 -0800 Subject: [PATCH 18/19] chore: switching cmds --- .../linux/cloud-init/artifacts/validate-kubelet-credentials.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData | 2 +- .../testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line315.sh | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line314.sh | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../CustomData | 2 +- .../line314.sh | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/CustomData | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh | 2 +- .../CustomData | 2 +- .../line322.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../CustomData | 2 +- .../line311.sh | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 2 +- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line309.sh | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/CustomData | 2 +- pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh | 2 +- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+DisableUnattendedUpgrades=true/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData | 2 +- .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh | 2 +- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 2 +- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line314.sh | 2 +- 181 files changed, 181 insertions(+), 181 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 6b9891acca4..4d8ffbd3674 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -30,7 +30,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 1e669d1a23c..4ff0e9f2aa0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index ef3afa63a8e..a99b119f81a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index ef3afa63a8e..a99b119f81a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 82012b2092e..05e028fc9da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 82012b2092e..05e028fc9da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 1e669d1a23c..4ff0e9f2aa0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 42e5abff42f..91bdd295bf6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 9dc1d269523..6fba55ef3f0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 1e669d1a23c..4ff0e9f2aa0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index ef3afa63a8e..a99b119f81a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 1e669d1a23c..4ff0e9f2aa0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index a0210aa1a33..2d937c32b6b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 577dbf6fa58..3a2271d4b74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index a0210aa1a33..2d937c32b6b 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index a5d0c2dec8d..9eddeea8622 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 521dcaefa0d..12c8df3fd6a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 00ad2aae3a3..dee1be9c694 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 7f2ad580ae4..94a81c498bd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index a5d0c2dec8d..9eddeea8622 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index a5d0c2dec8d..9eddeea8622 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 0879b5809a5..433ba17f56a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index bcbed2fd23c..38222f81485 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 9cbf9cdcee9..611e2c43950 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 521dcaefa0d..12c8df3fd6a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 639806e69a9..7ac4b928026 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index d23011f4684..99b1198fb06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index eaa2b24eab9..e81c4a732a1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 41be4519947..702fda4ea02 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 09053d59528..ea9a3c47f0c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index a0b33715048..b2a86ab3edd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 4fd234a78e4..74cffc50bd8 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 39648e43305..380ccda875a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 3abc25c0cbd..4d5efdcdaab 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 3abc25c0cbd..4d5efdcdaab 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 3abc25c0cbd..4d5efdcdaab 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 5b6fdaf9562..90ad31bd0ed 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 3abc25c0cbd..4d5efdcdaab 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 604aa3609e1..2fd96e342e2 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 8a9420e5970..4d7f277c633 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 6dfa4154530..c1a782980f7 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 023d6b5cd7e..4ceb9a1fe3e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 29ccef670e5..aa407fab2fb 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index f10c96c2db2..3387407f5f4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index ef3afa63a8e..a99b119f81a 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index a72928daba7..1f03bd02c47 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 8950de50d8d..1027f05b1cf 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index 6b237df537a..ce50ded8994 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index 6b237df537a..ce50ded8994 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index 6b237df537a..ce50ded8994 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index 6b237df537a..ce50ded8994 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index 6b237df537a..ce50ded8994 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 9765a29a3c5..15b7a92af5a 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 9765a29a3c5..15b7a92af5a 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 27a22fa2149..392942210d7 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 3550ffe0e5d..ee8a1cca639 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 3550ffe0e5d..ee8a1cca639 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 3550ffe0e5d..ee8a1cca639 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 3550ffe0e5d..ee8a1cca639 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 3550ffe0e5d..ee8a1cca639 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 1e669d1a23c..4ff0e9f2aa0 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index a2dcf8c0768..74b95da9034 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RTUU/bTBB8v1+x+LN4wph8fUsFkiFuGxEISkxV1CLrbK/jE8ed61sHWpT/XjkhMVh2SPKQOL7dmZuZ3f8O3EgoN+ImYwYJHCw15CLHlAvJmNFlESO4OieX/y0LdGOtiAuFhXHzQs+FEVqFq7Jjk7EVyDNjl7fn/sX4+svwa3jjBd9OLful8arvuHNeuFJE7kMZoURa/sZapWK2sNj5eBxMg4l3E7ZgdR62oEZak6GC5847fPbdGw0HXuAvIUZ+EF5M/IF/HQy90TS88n6EEz+YDP3pqf2ya2nf+XSy2A5cVd6FA3/k3YXT6uaDDwlaWvpObyeeYHjlj2+D/ZgaTX2nd7JgLC1VTEIrmHMpEk54uXETXhgAgNQxl1CbHOacslO7x5an1Wf1JFI4gAKp+BM/JqFIw2rYygLB3tVn+LWBtPe1bs/ehhlvupdCSQIvKYOYK0dAXCAnhBgLEqmIOaERMyXUrMDfJRoy4LwZQrDshlnWZ6AMVe3X+gHjTIP1OtEVTYKKBJfrMKpcKhcxOYInISUYqr45ET7mBKTBEC8IXhGsGvhZEJws/6aCdcUskS42nOY1bpHCTzgAJwXLbmyhBfdweFgfd66rBfcNySulkabszST1ockAXCXQttl96GaDRIPSVIk2dASl4pHEj8zprc2pZ/cpE3G2yf/MTXDuqlJK+P/ssNeqZ11bsae6VJuYHkQOW2PtiqqOoCOA1nssSdfJbjW45m3Zd6u7ujGpUqB6p0yYFeBWXW2X3TfsFUHr5T/oeS9hwwukH1C1a1kwJvXMhKRDnKMiA5Z3OT2elIrEIx5375K1Zc/+BQAA///yepWjnQcAAA== + H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index 89229f074b5..ee85d9344c4 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -20,7 +20,7 @@ function validateKubeconfig { if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth can-i create certificatesigningrequests --kubeconfig "$kubeconfig_path"; then + kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 From b6eebb46f6f5a3239c8f00560a63a753befe977c Mon Sep 17 00:00:00 2001 From: Cameron Meissner Date: Fri, 7 Mar 2025 16:26:00 -0800 Subject: [PATCH 19/19] chore: timeout --- .../artifacts/validate-kubelet-credentials.sh | 16 ++++++++++++---- .../testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+Containerd/line315.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../testdata/AKSUbuntu1604+Docker/CustomData | 2 +- .../testdata/AKSUbuntu1604+Docker/line315.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- .../AKSUbuntu1604+GPUDedicatedVHD/line322.sh | 7 +++---- .../testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S115/line315.sh | 7 +++---- .../testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S117/line314.sh | 7 +++---- .../testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- .../testdata/AKSUbuntu1604+K8S118/line314.sh | 7 +++---- .../AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- .../AKSUbuntu1604+KubeletConfigFile/line315.sh | 7 +++---- .../AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- .../AKSUbuntu1604+OSKubeletDisk/line315.sh | 7 +++---- .../AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../AKSUbuntu1604+TempDisk+Containerd/line316.sh | 7 +++---- .../AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- .../AKSUbuntu1604+TempDiskExplicit/line316.sh | 7 +++---- .../AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- .../AKSUbuntu1604+TempDiskToggle/line316.sh | 7 +++---- .../AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+ArtifactStreaming/line314.sh | 7 +++---- .../CustomData | 2 +- .../line321.sh | 7 +++---- .../AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Certsd/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet/line314.sh | 7 +++---- .../CustomData | 2 +- .../line321.sh | 7 +++---- .../AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG/line321.sh | 7 +++---- .../AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MotD/line314.sh | 7 +++---- .../CustomData | 2 +- .../line322.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Teleport/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1804+CustomCATrust/CustomData | 2 +- .../AKSUbuntu1804+CustomCATrust/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1804+DisableCustomData/CustomData | 2 +- .../AKSUbuntu1804+DisableCustomData/line314.sh | 7 +++---- .../testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- .../testdata/AKSUbuntu1804+HTTPProxy/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../AKSUbuntu1804+NoArtifactStreaming/line314.sh | 7 +++---- .../testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoneCNI/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- .../testdata/AKSUbuntu1804+krustlet/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../testdata/AKSUbuntu2204+China/CustomData | 2 +- .../testdata/AKSUbuntu2204+China/line314.sh | 7 +++---- .../CustomData | 2 +- .../line321.sh | 7 +++---- .../AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG/line321.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../AKSUbuntu2204+CustomCloud/CustomData | 2 +- .../AKSUbuntu2204+CustomCloud/line315.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOff/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeBlocked/line314.sh | 7 +++---- .../AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNil/line314.sh | 7 +++---- .../AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- .../AKSUbuntu2204+OutboundTypeNone/line314.sh | 7 +++---- .../AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOff/line314.sh | 7 +++---- .../AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- .../AKSUbuntu2204+SSHStatusOn/line314.sh | 7 +++---- .../CustomData | 2 +- .../line322.sh | 7 +++---- .../CustomData | 2 +- .../line322.sh | 7 +++---- .../AKSUbuntu2204+SecurityProfile/CustomData | 2 +- .../AKSUbuntu2204+SecurityProfile/line314.sh | 7 +++---- .../AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../AKSUbuntu2204+SerializeImagePulls/line314.sh | 7 +++---- .../testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- .../testdata/AKSUbuntu2204+cgroupv2/line314.sh | 7 +++---- .../CustomData | 2 +- .../line314.sh | 7 +++---- .../CustomData | 2 +- .../line315.sh | 7 +++---- .../AKSUbuntu2404+NetworkPolicy/CustomData | 2 +- .../AKSUbuntu2404+NetworkPolicy/line314.sh | 7 +++---- .../testdata/AKSUbuntu2404+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu2404+Teleport/line314.sh | 7 +++---- pkg/agent/testdata/AzureLinuxV2+Kata/CustomData | 2 +- pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line309.sh | 7 +++---- .../testdata/CustomizedImageKata/CustomData | 2 +- .../testdata/CustomizedImageKata/line309.sh | 7 +++---- .../testdata/MarinerV2+CustomCloud/CustomData | 2 +- .../testdata/MarinerV2+CustomCloud/line312.sh | 7 +++---- pkg/agent/testdata/MarinerV2+Kata/CustomData | 2 +- pkg/agent/testdata/MarinerV2+Kata/line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- .../CustomData | 2 +- .../line311.sh | 7 +++---- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line315.sh | 7 +++---- .../testdata/RawUbuntuContainerd/CustomData | 2 +- .../testdata/RawUbuntuContainerd/line314.sh | 7 +++---- 181 files changed, 372 insertions(+), 454 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh index 4d8ffbd3674..946524cd628 100644 --- a/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh +++ b/parts/linux/cloud-init/artifacts/validate-kubelet-credentials.sh @@ -27,10 +27,18 @@ function validateKubeconfig { # exit 0 # fi - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + # if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ + # $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ + # $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ + # kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + # # for now we simply exit 0 here to prevent provisioning failures in cases where the credential + # # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register + # echo "kubelet credential validation failed, will still attempt to start kubelet" + # exit 0 + # fi + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then # for now we simply exit 0 here to prevent provisioning failures in cases where the credential # doesn't become valid until after we've exhausted our retries - kubelet should still eventually be able to register diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 4ff0e9f2aa0..5af3e0184d8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index a99b119f81a..a574f324655 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index a99b119f81a..a574f324655 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 05e028fc9da..7c7e6ae8812 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 05e028fc9da..7c7e6ae8812 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 4ff0e9f2aa0..5af3e0184d8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 91bdd295bf6..8a823a2fcd1 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 6fba55ef3f0..1e0b16134d7 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line322.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 4ff0e9f2aa0..5af3e0184d8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index a99b119f81a..a574f324655 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 4ff0e9f2aa0..5af3e0184d8 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 2d937c32b6b..5762d2c6d72 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line316.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 3a2271d4b74..d4ece9079c5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line316.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 2d937c32b6b..5762d2c6d72 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -313,7 +313,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line316.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 9eddeea8622..83a56834b7e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line321.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 12c8df3fd6a..bd2b632af10 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index dee1be9c694..d6ced676eb7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 94a81c498bd..c3313c06fd6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 9eddeea8622..83a56834b7e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line321.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 9eddeea8622..83a56834b7e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line321.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 433ba17f56a..dc2f6ff4126 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line322.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 38222f81485..d61cac105fe 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 611e2c43950..c83f8df3183 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 12c8df3fd6a..bd2b632af10 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData index 7ac4b928026..42d5a1ecc9a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+WithKubeletClientCert/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 99b1198fb06..d1b5dbde0ab 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index e81c4a732a1..2fe9594dd89 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 702fda4ea02..82f199fb2bc 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index ea9a3c47f0c..bccf95b2e9f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line321.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index b2a86ab3edd..6e38e3c3a3f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -318,7 +318,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line321.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 74cffc50bd8..b7499f0f8ff 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 380ccda875a..6be3f1ad3aa 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 4d5efdcdaab..73f87b225da 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 4d5efdcdaab..73f87b225da 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 4d5efdcdaab..73f87b225da 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 90ad31bd0ed..2a6e3a04364 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 4d5efdcdaab..73f87b225da 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index 2fd96e342e2..07159fd6401 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 4d7f277c633..b5f61f0cdcd 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line322.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index c1a782980f7..c8157d7ba0c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -319,7 +319,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line322.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index 4ceb9a1fe3e..60109e8569e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index aa407fab2fb..35aa6ffce6e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index 3387407f5f4..c2a0762c100 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index a99b119f81a..a574f324655 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData index 1f03bd02c47..d7b391264f2 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+NetworkPolicy/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData index 1027f05b1cf..c77fdc3c03a 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+Teleport/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index ce50ded8994..f148d0083fd 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index ce50ded8994..f148d0083fd 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index ce50ded8994..f148d0083fd 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index ce50ded8994..f148d0083fd 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index ce50ded8994..f148d0083fd 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 15b7a92af5a..022b30d532c 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImage/line309.sh b/pkg/agent/testdata/CustomizedImage/line309.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/CustomizedImage/line309.sh +++ b/pkg/agent/testdata/CustomizedImage/line309.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 15b7a92af5a..022b30d532c 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -306,7 +306,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/CustomizedImageKata/line309.sh b/pkg/agent/testdata/CustomizedImageKata/line309.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line309.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line309.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 392942210d7..bc4cc110154 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -309,7 +309,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line312.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index ee8a1cca639..0e023332eba 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line311.sh b/pkg/agent/testdata/MarinerV2+Kata/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line311.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index ee8a1cca639..0e023332eba 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index ee8a1cca639..0e023332eba 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index ee8a1cca639..0e023332eba 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index ee8a1cca639..0e023332eba 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -308,7 +308,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line311.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 4ff0e9f2aa0..5af3e0184d8 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -312,7 +312,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntu/line315.sh b/pkg/agent/testdata/RawUbuntu/line315.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/RawUbuntu/line315.sh +++ b/pkg/agent/testdata/RawUbuntu/line315.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0 diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 74b95da9034..819c9b14cc0 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -311,7 +311,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/5RT0U7bQBB8v69YXIsnjJP2LRVIhrhtRCAoMVVRi6yzvcYnLneWbx1oUf69ckJisOxA8pA4vt2Zm5ndTwduJJQbcZMxgwQOlhpykWPKhWTM6LKIEVydk8v/lQW6sVbEhcLCuHmhF8IIrcJ12bHJ2BrkibGLmzP/fHL1bfQ9vPaCHyeW/dx4NXDcBS9cKSL3oYxQIq1+Y61Scb+02NlkEsyCqXcdtmB1HragRlqToYLnzht89tMbj4Ze4K8gxn4Qnk/9oX8VjLzxLLz0foVTP5iO/NmJ/fzR0oHzpbfcDVxV3oZDf+zdhrPq5sN3CVpaBk7/QzzB6NKf3AT7MTWaBk6/t2QsLVVMQitYcCkSTnixdROeGQCA1DGXUJsc5pyyE7vPVqfVZ/0kUjiAAqn4G8+TUKRhNWxlgWB/1Gf4s4W097Vuz96GGa+6V0JJAi8pg8dM87kAZwH9HjivJg0su+GI9RUoQ1WbsnnAONNgvYwtxAUmqEhwuXG8Mr+yCpMjeBRSgqHqmxPhPCcgDYZ4QfCCYNXAT4Kgt/qbCtaVpUQ633Kal0xFCr/hAJwULLuxahbcweFhfdy5kxbcNSSvlUaaslfjMoAmA3CVQNv6DqCbDRINSlMl2tARlIpHEt8zp78xpx7Qx0zE2TbkUzfBhatKKeHz6WG/Vc+mtmJPdam2MT2IHHbG2hVVHUFHAK33WJFukt1pcM3bstRWd3VjUqVA9UaZMGvAnbraLrtv2GuC1su/0/NWwpYXSD+gateyZEzqexOSDnGBigxY3sXseFoqEnM87t4la8ee/Q8AAP//TPdy1oIHAAA= + H4sIAAAAAAAC/5RTYU+jQBD9vr9i3Gv8JFLuvnHRBC1311itafFy5mLIAotsXHcJO6A50/9+odiiBFrth5ays+/Ne2/my4EdCWVHzGTEcASLlxpykfOUCUmI0WURc7B1jjb7VxbcjrVCJhQvjJ0XuhJGaBU2ZccmIw3IMyEXN2f++fzqx/RneO0Fv07o6KXzyrXsihW2FJH9UEZcclz/xlql4n5Fydl8HiyDhXcd9mANHvagRlqjwYLl1jt88tubTSde4K8hZn4Qni/8iX8VTL3ZMrz0/oQLP1hM/eXJ6OWjpa71bbzaDVxX3oYTf+bdhsu688legp4rruV8iCeYXvrzm+BzTJ1LruWMV4SkpYpRaAUVkyJhyC+2bsILAQCQOmYSWpPDnGF2MnLI+rT+dJ9ECgfNBZTASszgKdPsUYBVgTMG601iQEcdZPodMOOqhdw88DjTQF/jh7jgCVcomNx0Xouo55snR/AkpASD9TdD5I85AmowyAqEVwTaAj8LhPH6byrIkCeS4/mW07x6I1L4CwdgpUBHnZGlcAeHh+3x4GxTuOtIbpRGGrM3trvQZQCmEuhbAxeG2SDRoDTWog0eQalYJPk+c5yNOW28T5mIs23Ip3bCK1uVUsLX00OnV8+mtmZPdam2MT2IHHbGOhRVG8FAAL19rEk3ye40uOXtWQ46XN2ZVCm4eqdMmAZwp66+Zj8bdkPQ2/yeO+8lbHkB9QNX/VpWhEh9b0LUIa+4QgPUu1geL0qF4pEfD+8S3bFn/wMAAP//i8ap6coGAAA= - path: /etc/kubernetes/certs/ca.crt permissions: "0600" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh index ee85d9344c4..cd9be2ca87e 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line314.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line314.sh @@ -17,10 +17,9 @@ function validateKubeconfig { - if ! retrycmd_if_failure $VALIDATE_KUBELET_CREDENTIALS_MAX_RETRIES \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_DELAY_SECONDS \ - $VALIDATE_KUBELET_CREDENTIALS_RETRY_TIMEOUT_SECONDS \ - kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then + + + if ! kubectl auth whoami -v 10 --kubeconfig "$kubeconfig_path"; then echo "kubelet credential validation failed, will still attempt to start kubelet" exit 0