From 9255754c846c7c26e0bd59c705b7287a3113a24f Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Tue, 28 Jan 2025 21:09:51 +1300 Subject: [PATCH 1/6] test: initial powershell test for windows nodes (#5635) --- e2e/exec.go | 74 ++++++++++++--- e2e/scenario_helpers_test.go | 14 ++- e2e/scenario_win_test.go | 25 ++++- e2e/validation.go | 9 +- e2e/validators.go | 171 ++++++++++++++++++++--------------- e2e/vmss.go | 12 +-- 6 files changed, 205 insertions(+), 100 deletions(-) diff --git a/e2e/exec.go b/e2e/exec.go index 4c6db305fef..5b073ab6bd3 100644 --- a/e2e/exec.go +++ b/e2e/exec.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/Azure/agentbaker/e2e/config" + "github.com/google/uuid" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -97,15 +98,66 @@ func sshKeyName(vmPrivateIP string) string { } func sshString(vmPrivateIP string) string { - return fmt.Sprintf(`ssh -i %s -o PasswordAuthentication=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 azureuser@%s`, sshKeyName(vmPrivateIP), vmPrivateIP) + return fmt.Sprintf(`ssh -i %[1]s -o PasswordAuthentication=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 azureuser@%[2]s`, sshKeyName(vmPrivateIP), vmPrivateIP) } -func execOnVM(ctx context.Context, kube *Kubeclient, vmPrivateIP, jumpboxPodName, sshPrivateKey, command string) (*podExecResult, error) { - sshCommand := fmt.Sprintf(`echo '%s' > %[2]s && chmod 0600 %[2]s && %s`, sshPrivateKey, sshKeyName(vmPrivateIP), sshString(vmPrivateIP)) - sshCommand = sshCommand + " sudo" - commandToExecute := fmt.Sprintf("%s %s", sshCommand, command) +func quoteForBash(command string) string { + return fmt.Sprintf("'%s'", strings.ReplaceAll(command, "'", "'\"'\"'")) +} + +func execBashCommandOnVM(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey, command string) (*podExecResult, error) { + image := &config.Image{ + OS: config.OSUbuntu, + } + return execScriptOnVm(ctx, s, vmPrivateIP, jumpboxPodName, sshPrivateKey, []string{command}, image) +} + +func execScriptOnVm(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey string, script []string, os *config.Image) (*podExecResult, error) { + /* + This works in a way that doesn't rely on the node having joined the cluster: + * We create a linux pod on a different node. + * on that pod, we create a script file containing the script passed into this method. + * Then we scp the script to the node under test. + * Then we execute the script using an interpreter (powershell or bash) based on the OS of the node. + */ + identifier := uuid.New().String() + + var scriptFileName, remoteScriptFileName string + if os.OS == config.OSWindows { + scriptFileName = fmt.Sprintf("script_file_%s.ps1", identifier) + remoteScriptFileName = fmt.Sprintf("c:/%s", scriptFileName) + } else { + scriptFileName = fmt.Sprintf("script_file_%s.sh", identifier) + remoteScriptFileName = scriptFileName + } + + var interpreter string + switch os.OS { + case config.OSWindows: + interpreter = "powershell" + break + default: + interpreter = "bash" + break + } + + scriptWithLineBreaks := strings.Join(script, "\n") + steps := []string{ + fmt.Sprintf("echo '%[1]s' > %[2]s", sshPrivateKey, sshKeyName(vmPrivateIP)), + "set -x", + fmt.Sprintf("echo %[1]s > %[2]s", quoteForBash(scriptWithLineBreaks), scriptFileName), + fmt.Sprintf("chmod 0600 %s", sshKeyName(vmPrivateIP)), + fmt.Sprintf("chmod 0755 %s", scriptFileName), + fmt.Sprintf(`scp -i %[1]s -o PasswordAuthentication=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 %[3]s azureuser@%[2]s:%[4]s`, sshKeyName(vmPrivateIP), vmPrivateIP, scriptFileName, remoteScriptFileName), + fmt.Sprintf("%s %s %s", sshString(vmPrivateIP), interpreter, remoteScriptFileName), + } + + joinedSteps := strings.Join(steps, " && ") + + s.T.Log(fmt.Sprintf("Executing script %s:\n---START-SCRIPT---\n%s\n---END-SCRIPT---\n", scriptFileName, scriptWithLineBreaks)) - execResult, err := execOnPrivilegedPod(ctx, kube, defaultNamespace, jumpboxPodName, commandToExecute) + kube := s.Runtime.Cluster.Kube + execResult, err := execOnPrivilegedPod(ctx, kube, defaultNamespace, jumpboxPodName, joinedSteps) if err != nil { return nil, fmt.Errorf("error executing command on pod: %w", err) } @@ -113,13 +165,13 @@ func execOnVM(ctx context.Context, kube *Kubeclient, vmPrivateIP, jumpboxPodName return execResult, nil } -func execOnPrivilegedPod(ctx context.Context, kube *Kubeclient, namespace, podName string, command string) (*podExecResult, error) { - privilegedCommand := append(privelegedCommandArray(), command) +func execOnPrivilegedPod(ctx context.Context, kube *Kubeclient, namespace string, podName string, bashCommand string) (*podExecResult, error) { + privilegedCommand := append(privilegedCommandArray(), bashCommand) return execOnPod(ctx, kube, namespace, podName, privilegedCommand) } -func execOnUnprivilegedPod(ctx context.Context, kube *Kubeclient, namespace, podName, command string) (*podExecResult, error) { - nonPrivilegedCommand := append(unprivilegedCommandArray(), command) +func execOnUnprivilegedPod(ctx context.Context, kube *Kubeclient, namespace string, podName string, bashCommand string) (*podExecResult, error) { + nonPrivilegedCommand := append(unprivilegedCommandArray(), bashCommand) return execOnPod(ctx, kube, namespace, podName, nonPrivilegedCommand) } @@ -170,7 +222,7 @@ func execOnPod(ctx context.Context, kube *Kubeclient, namespace, podName string, }, nil } -func privelegedCommandArray() []string { +func privilegedCommandArray() []string { return []string{ "chroot", "/proc/1/root", diff --git a/e2e/scenario_helpers_test.go b/e2e/scenario_helpers_test.go index ddee8bb5491..86e77c7c9dd 100644 --- a/e2e/scenario_helpers_test.go +++ b/e2e/scenario_helpers_test.go @@ -122,6 +122,18 @@ func prepareAKSNode(ctx context.Context, s *Scenario) { } var err error s.Runtime.SSHKeyPrivate, s.Runtime.SSHKeyPublic, err = getNewRSAKeyPair() + publicKeyData := datamodel.PublicKey{KeyData: string(s.Runtime.SSHKeyPublic)} + + // check it all. + if s.Runtime.NBC != nil && s.Runtime.NBC.ContainerService != nil && s.Runtime.NBC.ContainerService.Properties != nil && s.Runtime.NBC.ContainerService.Properties.LinuxProfile != nil { + if s.Runtime.NBC.ContainerService.Properties.LinuxProfile.SSH.PublicKeys == nil { + s.Runtime.NBC.ContainerService.Properties.LinuxProfile.SSH.PublicKeys = []datamodel.PublicKey{} + } + // Windows fetches SSH keys from the linux profile and replaces any existing SSH keys with these. So we have to set + // the Linux SSH keys for Windows SSH to work. Yeah. I find it odd too. + s.Runtime.NBC.ContainerService.Properties.LinuxProfile.SSH.PublicKeys = append(s.Runtime.NBC.ContainerService.Properties.LinuxProfile.SSH.PublicKeys, publicKeyData) + } + require.NoError(s.T, err) createVMSS(ctx, s) err = getCustomScriptExtensionStatus(ctx, s) @@ -179,7 +191,7 @@ func validateVM(ctx context.Context, s *Scenario) { // skip when outbound type is block as the wasm will create pod from gcr, however, network isolated cluster scenario will block egress traffic of gcr. // TODO(xinhl): add another way to validate - if s.Runtime.NBC != nil && s.Runtime.NBC.AgentPoolProfile.WorkloadRuntime == datamodel.WasmWasi && s.Runtime.NBC.OutboundType != datamodel.OutboundTypeBlock && s.Runtime.NBC.OutboundType != datamodel.OutboundTypeNone { + if s.Runtime.NBC != nil && s.Runtime.NBC.AgentPoolProfile != nil && s.Runtime.NBC.AgentPoolProfile.WorkloadRuntime == datamodel.WasmWasi && s.Runtime.NBC.OutboundType != datamodel.OutboundTypeBlock && s.Runtime.NBC.OutboundType != datamodel.OutboundTypeNone { ValidateWASM(ctx, s, s.Runtime.KubeNodeName) } if s.Runtime.AKSNodeConfig != nil && s.Runtime.AKSNodeConfig.WorkloadRuntime == aksnodeconfigv1.WorkloadRuntime_WORKLOAD_RUNTIME_WASM_WASI { diff --git a/e2e/scenario_win_test.go b/e2e/scenario_win_test.go index ed2454a3daf..86b0573ab4a 100644 --- a/e2e/scenario_win_test.go +++ b/e2e/scenario_win_test.go @@ -1,6 +1,7 @@ package e2e import ( + "context" "testing" "github.com/Azure/agentbaker/e2e/config" @@ -16,6 +17,10 @@ func Test_Windows2019Containerd(t *testing.T) { VHD: config.VHDWindows2019Containerd, VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {}, BootstrapConfigMutator: func(configuration *datamodel.NodeBootstrappingConfiguration) {}, + Validator: func(ctx context.Context, s *Scenario) { + ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") + ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) + }, }, }) } @@ -28,7 +33,10 @@ func Test_Windows2022Containerd(t *testing.T) { VHD: config.VHDWindows2022Containerd, VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {}, BootstrapConfigMutator: func(configuration *datamodel.NodeBootstrappingConfiguration) { - + }, + Validator: func(ctx context.Context, s *Scenario) { + ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") + ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) }, }, }) @@ -42,7 +50,10 @@ func Test_Windows2022ContainerdGen2(t *testing.T) { VHD: config.VHDWindows2022ContainerdGen2, VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {}, BootstrapConfigMutator: func(configuration *datamodel.NodeBootstrappingConfiguration) { - + }, + Validator: func(ctx context.Context, s *Scenario) { + ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") + ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) }, }, }) @@ -56,7 +67,10 @@ func Test_Windows23H2(t *testing.T) { VHD: config.VHDWindows23H2, VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {}, BootstrapConfigMutator: func(configuration *datamodel.NodeBootstrappingConfiguration) { - + }, + Validator: func(ctx context.Context, s *Scenario) { + ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") + ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) }, }, }) @@ -70,7 +84,10 @@ func Test_Windows23H2Gen2(t *testing.T) { VHD: config.VHDWindows23H2Gen2, VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {}, BootstrapConfigMutator: func(configuration *datamodel.NodeBootstrappingConfiguration) { - + }, + Validator: func(ctx context.Context, s *Scenario) { + ValidateFileHasContent(ctx, s, "/k/kubeletstart.ps1", "--container-runtime=remote") + ValidateWindowsProcessHasCliArguments(ctx, s, "kubelet.exe", []string{"--rotate-certificates=true", "--client-ca-file=c:\\k\\ca.crt"}) }, }, }) diff --git a/e2e/validation.go b/e2e/validation.go index d254cc1f658..bc112ca65a5 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -34,11 +34,12 @@ func ValidateWASM(ctx context.Context, s *Scenario, nodeName string) { } func ValidateCommonLinux(ctx context.Context, s *Scenario) { - execResult := execOnVMForScenarioValidateExitCode(ctx, s, "cat /etc/default/kubelet", 0, "could not read kubelet config") - require.NotContains(s.T, execResult.stdout.String(), "--dynamic-config-dir", "kubelet flag '--dynamic-config-dir' should not be present in /etc/default/kubelet") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/default/kubelet"}, 0, "could not read kubelet config") + 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") // the instructions belows expects the SSH key to be uploaded to the user pool VM. - // which happens as a side-effect of execOnVMForScenario, it's ugly but works. + // 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. logSSHInstructions(s) @@ -61,7 +62,7 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { //"cloud-config.txt", // file with UserData }) - execResult = execOnVMForScenarioValidateExitCode(ctx, s, "curl http://168.63.129.16:32526/vmSettings", 0, "curl to wireserver failed") + execResult = execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"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 22159bbfddb..5e84f275726 100644 --- a/e2e/validators.go +++ b/e2e/validators.go @@ -18,10 +18,14 @@ import ( ) func ValidateDirectoryContent(ctx context.Context, s *Scenario, path string, files []string) { - command := fmt.Sprintf("ls -la %s", path) - execResult := execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not get directory contents") + command := []string{ + "set -ex", + fmt.Sprintf("sudo ls -la %s", path), + } + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not get directory contents") + stdout := execResult.stdout.String() for _, file := range files { - require.Contains(s.T, execResult.stdout.String(), file, "expected to find file %s within directory %s, but did not", file, path) + require.Contains(s.T, stdout, file, "expected to find file %s within directory %s, but did not.\nDirectory contents:\n%s", file, path, stdout) } } @@ -30,81 +34,85 @@ func ValidateSysctlConfig(ctx context.Context, s *Scenario, customSysctls map[st for k := range customSysctls { keysToCheck = append(keysToCheck, k) } - execResult := execOnVMForScenarioValidateExitCode(ctx, s, fmt.Sprintf("sysctl %s | sed -E 's/([0-9])\\s+([0-9])/\\1 \\2/g'", strings.Join(keysToCheck, " ")), 0, "systmctl command failed") + command := []string{ + "set -ex", + fmt.Sprintf("sudo sysctl %s | sed -E 's/([0-9])\\s+([0-9])/\\1 \\2/g'", strings.Join(keysToCheck, " ")), + } + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "systmctl command failed") + stdout := execResult.stdout.String() for name, value := range customSysctls { - require.Contains(s.T, execResult.stdout.String(), fmt.Sprintf("%s = %v", name, value), "expected to find %s set to %v, but was not", name, value) + require.Contains(s.T, stdout, fmt.Sprintf("%s = %v", name, value), "expected to find %s set to %v, but was not.\nStdout:\n%s", name, value, stdout) } } func ValidateNvidiaSMINotInstalled(ctx context.Context, s *Scenario) { - command := "nvidia-smi" - execResult := execOnVMForScenarioValidateExitCode(ctx, s, command, 1, "") - require.Contains(s.T, execResult.stderr.String(), "nvidia-smi: command not found", "expected stderr to contain 'nvidia-smi: command not found', but got %q", execResult.stderr.String()) + command := []string{ + "set -ex", + "sudo nvidia-smi", + } + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 1, "") + stderr := execResult.stderr.String() + require.Contains(s.T, stderr, "nvidia-smi: command not found", "expected stderr to contain 'nvidia-smi: command not found', but got %q", stderr) } func ValidateNvidiaSMIInstalled(ctx context.Context, s *Scenario) { - command := "nvidia-smi" - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not execute nvidia-smi command") + command := []string{"set -ex", "sudo nvidia-smi"} + execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not execute nvidia-smi command") } func ValidateNvidiaModProbeInstalled(ctx context.Context, s *Scenario) { - command := "nvidia-modprobe" - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "cound not execute nvidia-modprobe command") + command := []string{ + "set -ex", + "sudo nvidia-modprobe", + } + execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "cound not execute nvidia-modprobe command") } func ValidateNonEmptyDirectory(ctx context.Context, s *Scenario, dirName string) { - command := fmt.Sprintf("ls -1q %s | grep -q '^.*$' && true || false", dirName) - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "either could not find expected file, or something went wrong") + command := []string{ + "set -ex", + fmt.Sprintf("sudo ls -1q %s | grep -q '^.*$' && true || false", dirName), + } + execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "either could not find expected file, or something went wrong") } func ValidateFileHasContent(ctx context.Context, s *Scenario, fileName string, contents string) { - steps := []string{ - fmt.Sprintf("ls -la %[1]s", fileName), - fmt.Sprintf("sudo cat %[1]s", fileName), - fmt.Sprintf("(sudo cat %[1]s | grep -q -F -e %[2]q)", fileName, contents), - } + if s.VHD.OS == config.OSWindows { + steps := []string{ + fmt.Sprintf("dir %[1]s", fileName), + fmt.Sprintf("Get-Content %[1]s", fileName), + fmt.Sprintf("if (Select-String -Path %s -Pattern \"%s\" -SimpleMatch -Quiet) { return 1 } else { return 0 }", fileName, contents), + } + + execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") + } else { + steps := []string{ + "set -ex", + fmt.Sprintf("ls -la %[1]s", fileName), + fmt.Sprintf("sudo cat %[1]s", fileName), + fmt.Sprintf("(sudo cat %[1]s | grep -q -F -e %[2]q)", fileName, contents), + } - command := makeExecutableCommand(steps) - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") + execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") + } } func ValidateFileExcludesContent(ctx context.Context, s *Scenario, fileName string, contents string) { require.NotEqual(s.T, "", contents, "Test setup failure: Can't validate that a file excludes an empty string. Filename: %s", fileName) steps := []string{ + "set -ex", fmt.Sprintf("test -f %[1]s || exit 0", fileName), fmt.Sprintf("ls -la %[1]s", fileName), fmt.Sprintf("sudo cat %[1]s", fileName), fmt.Sprintf("(sudo cat %[1]s | grep -q -v -F -e %[2]q)", fileName, contents), } - command := makeExecutableCommand(steps) - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not validate file excludes contents - might mean file does have contents, might mean something went wrong") -} - -// this function is just used to remove some bash specific tokens so we can echo the command to stdout. -func cleanse(str string) string { - return strings.Replace(str, "'", "", -1) -} - -func makeExecutableCommand(steps []string) string { - stepsWithEchos := make([]string, len(steps)*2) - - for i, s := range steps { - stepsWithEchos[i*2] = fmt.Sprintf("echo '%s'", cleanse(s)) - stepsWithEchos[i*2+1] = s - } - - // quote " quotes and $ vars - joinedCommand := strings.Join(stepsWithEchos, " && ") - quotedCommand := strings.Replace(joinedCommand, "'", "'\"'\"'", -1) - - command := fmt.Sprintf("bash -c '%s'", quotedCommand) - - return command + execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file excludes contents - might mean file does have contents, might mean something went wrong") } func ServiceCanRestartValidator(ctx context.Context, s *Scenario, serviceName string, restartTimeoutInSeconds int) { steps := []string{ + "set -ex", // Verify the service is active - print the state then verify so we have logs fmt.Sprintf("(systemctl -n 5 status %s || true)", serviceName), fmt.Sprintf("systemctl is-active %s", serviceName), @@ -131,8 +139,7 @@ func ServiceCanRestartValidator(ctx context.Context, s *Scenario, serviceName st "if [[ \"$INITIAL_PID\" == \"$POST_PID\" ]]; then echo PID did not change after restart, failing validator. ; exit 1; fi", } - command := makeExecutableCommand(steps) - execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "command to restart service failed") + execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "command to restart service failed") } func ValidateUlimitSettings(ctx context.Context, s *Scenario, ulimits map[string]string) { @@ -141,8 +148,8 @@ func ValidateUlimitSettings(ctx context.Context, s *Scenario, ulimits map[string ulimitKeys = append(ulimitKeys, k) } - command := fmt.Sprintf("systemctl cat containerd.service | grep -E -i '%s'", strings.Join(ulimitKeys, "|")) - execResult := execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not read containerd.service file") + command := fmt.Sprintf("sudo systemctl cat containerd.service | grep -E -i '%s'", strings.Join(ulimitKeys, "|")) + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 0, "could not read containerd.service file") for name, value := range ulimits { require.Contains(s.T, execResult.stdout.String(), fmt.Sprintf("%s=%v", name, value), "expected to find %s set to %v, but was not", name, value) @@ -157,14 +164,14 @@ func execOnVMForScenarioOnUnprivilegedPod(ctx context.Context, s *Scenario, cmd return execResult } -func execOnVMForScenario(ctx context.Context, s *Scenario, cmd string) *podExecResult { - result, err := execOnVM(ctx, s.Runtime.Cluster.Kube, s.Runtime.VMPrivateIP, s.Runtime.DebugHostPod, string(s.Runtime.SSHKeyPrivate), cmd) +func execScriptOnVMForScenario(ctx context.Context, s *Scenario, cmd []string) *podExecResult { + result, err := execScriptOnVm(ctx, s, s.Runtime.VMPrivateIP, s.Runtime.DebugHostPod, string(s.Runtime.SSHKeyPrivate), cmd, s.VHD) require.NoError(s.T, err, "failed to execute command on VM") return result } -func execOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, cmd string, expectedExitCode int, additionalErrorMessage string) *podExecResult { - execResult := execOnVMForScenario(ctx, s, cmd) +func execScriptOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, cmd []string, expectedExitCode int, additionalErrorMessage string) *podExecResult { + execResult := execScriptOnVMForScenario(ctx, s, cmd) expectedExitCodeStr := fmt.Sprint(expectedExitCode) require.Equal(s.T, expectedExitCodeStr, execResult.exitCode, "exec command failed with exit code %q, expected exit code %s\nCommand: %s\nAdditional detail: %s\nSTDOUT:\n%s\n\nSTDERR:\n%s", execResult.exitCode, expectedExitCodeStr, cmd, additionalErrorMessage, execResult.stdout, execResult.stderr) @@ -174,18 +181,18 @@ func execOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, cmd s func ValidateInstalledPackageVersion(ctx context.Context, s *Scenario, component, version string) { s.T.Logf("assert %s %s is installed on the VM", component, version) - installedCommand := func() string { + installedCommand := func() []string { switch s.VHD.OS { case config.OSUbuntu: - return "apt list --installed" + return []string{"sudo apt list --installed"} case config.OSMariner, config.OSAzureLinux: - return "dnf list installed" + return []string{"sudo dnf list installed"} default: s.T.Fatalf("command to get package list isn't implemented for OS %s", s.VHD.OS) - return "" + return []string{""} } }() - execResult := execOnVMForScenarioValidateExitCode(ctx, s, installedCommand, 0, "could not get package list") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, installedCommand, 0, "could not get package list") containsComponent := func() bool { for _, line := range strings.Split(execResult.stdout.String(), "\n") { if strings.Contains(line, component) && strings.Contains(line, version) { @@ -201,30 +208,31 @@ func ValidateInstalledPackageVersion(ctx context.Context, s *Scenario, component } func ValidateKubeletNodeIP(ctx context.Context, s *Scenario) { - execResult := execOnVMForScenarioValidateExitCode(ctx, s, "cat /etc/default/kubelet", 0, "could lot read kubelet config") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/default/kubelet"}, 0, "could not read kubelet config") + stdout := execResult.stdout.String() // Search for "--node-ip" flag and its value. - matches := regexp.MustCompile(`--node-ip=([a-zA-Z0-9.,]*)`).FindStringSubmatch(execResult.stdout.String()) - require.NotNil(s.T, matches, "could not find kubelet flag --node-ip") - require.GreaterOrEqual(s.T, len(matches), 2, "could not find kubelet flag --node-ip") + matches := regexp.MustCompile(`--node-ip=([a-zA-Z0-9.,]*)`).FindStringSubmatch(stdout) + require.NotNil(s.T, matches, "could not find kubelet flag --node-ip\nStdout: \n%s", stdout) + require.GreaterOrEqual(s.T, len(matches), 2, "could not find kubelet flag --node-ip.\nStdout: \n%s", stdout) ipAddresses := strings.Split(matches[1], ",") // Could be multiple for dual-stack. - require.GreaterOrEqual(s.T, len(ipAddresses), 1, "expected at least one --node-ip address, but got none") - require.LessOrEqual(s.T, len(ipAddresses), 2, "expected at most two --node-ip addresses, but got %d", len(ipAddresses)) + require.GreaterOrEqual(s.T, len(ipAddresses), 1, "expected at least one --node-ip address, but got none\nStdout: \n%s", stdout) + require.LessOrEqual(s.T, len(ipAddresses), 2, "expected at most two --node-ip addresses, but got %d\nStdout: \n%s", len(ipAddresses), stdout) // Check that each IP is a valid address. for _, ipAddress := range ipAddresses { - require.NotNil(s.T, net.ParseIP(ipAddress), "--node-ip value %q is not a valid IP address", ipAddress) + require.NotNil(s.T, net.ParseIP(ipAddress), "--node-ip value %q is not a valid IP address\nStdout: \n%s", ipAddress, stdout) } } func ValidateIMDSRestrictionRule(ctx context.Context, s *Scenario, table string) { - cmd := fmt.Sprintf("iptables -t %s -S | grep -q 'AKS managed: added by AgentBaker ensureIMDSRestriction for IMDS restriction feature'", table) - execOnVMForScenarioValidateExitCode(ctx, s, cmd, 0, "expected to find IMDS restriction rule, but did not") + cmd := fmt.Sprintf("sudo iptables -t %s -S | grep -q 'AKS managed: added by AgentBaker ensureIMDSRestriction for IMDS restriction feature'", table) + execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{cmd}, 0, "expected to find IMDS restriction rule, but did not") } func ValidateMultipleKubeProxyVersionsExist(ctx context.Context, s *Scenario) { - execResult := execOnVMForScenario(ctx, s, "ctr --namespace k8s.io images list | grep kube-proxy | awk '{print $1}' | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+'") + execResult := execScriptOnVMForScenario(ctx, s, []string{"sudo ctr --namespace k8s.io images list | grep kube-proxy | awk '{print $1}' | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+'"}) if execResult.exitCode != "0" { s.T.Errorf("Failed to list kube-proxy images: %s", execResult.stderr) return @@ -249,7 +257,7 @@ func ValidateMultipleKubeProxyVersionsExist(ctx context.Context, s *Scenario) { } func ValidateContainerdWASMShims(ctx context.Context, s *Scenario) { - execResult := execOnVMForScenarioValidateExitCode(ctx, s, "cat /etc/containerd/config.toml", 0, "could not get containerd config content") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/containerd/config.toml"}, 0, "could not get containerd config content") expectedShims := []string{ `[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]`, `runtime_type = "io.containerd.spin.v2"`, @@ -281,21 +289,21 @@ func ValidateContainerdWASMShims(ctx context.Context, s *Scenario) { } func ValidateKubeletHasNotStopped(ctx context.Context, s *Scenario) { - command := "journalctl -u kubelet" - execResult := execOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not retrieve kubelet logs") + command := "sudo journalctl -u kubelet" + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 0, "could not retrieve kubelet logs") assert.NotContains(s.T, execResult.stdout.String(), "Stopped Kubelet") assert.Contains(s.T, execResult.stdout.String(), "Started Kubelet") } func ValidateServicesDoNotRestartKubelet(ctx context.Context, s *Scenario) { // grep all filesin /etc/systemd/system/ for /restart\s+kubelet/ and count results - command := "grep -rl 'restart[[:space:]]\\+kubelet' /etc/systemd/system/" - execOnVMForScenarioValidateExitCode(ctx, s, command, 1, "expected to find no services containing 'restart kubelet' in /etc/systemd/system/") + command := "sudo grep -rl 'restart[[:space:]]\\+kubelet' /etc/systemd/system/" + execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 1, "expected to find no services containing 'restart kubelet' in /etc/systemd/system/") } // ValidateKubeletHasFlags checks kubelet is started with the right flags and configs. func ValidateKubeletHasFlags(ctx context.Context, s *Scenario, filePath string) { - execResult := execOnVMForScenarioValidateExitCode(ctx, s, `journalctl -u kubelet`, 0, "could not get kubelet logs") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{`sudo journalctl -u kubelet`}, 0, "could not get kubelet logs") configFileFlags := fmt.Sprintf("FLAG: --config=\"%s\"", filePath) require.Containsf(s.T, execResult.stdout.String(), configFileFlags, "expected to find flag %s, but not found", "config") } @@ -365,3 +373,18 @@ func ValidateRunc12Properties(ctx context.Context, s *Scenario, versions []strin require.Truef(s.T, strings.HasPrefix(versions[0], "1.2."), "expected moby-runc version to start with '1.2.', got %v", versions[0]) ValidateInstalledPackageVersion(ctx, s, "moby-runc", versions[0]) } + +func ValidateWindowsProcessHasCliArguments(ctx context.Context, s *Scenario, processName string, arguments []string) { + steps := []string{ + fmt.Sprintf("(Get-CimInstance Win32_Process -Filter \"name='%[1]s'\")[0].CommandLine", processName), + } + + podExecResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate command has parameters - might mean file does not have params, might mean something went wrong") + + actualArgs := strings.Split(podExecResult.stdout.String(), " ") + + for i := 0; i < len(arguments); i++ { + expectedArgument := arguments[i] + require.Contains(s.T, actualArgs, expectedArgument) + } +} diff --git a/e2e/vmss.go b/e2e/vmss.go index 0ea5bf912aa..aad32a58d27 100644 --- a/e2e/vmss.go +++ b/e2e/vmss.go @@ -115,11 +115,11 @@ func extractLogsFromVMLinux(ctx context.Context, s *Scenario) { require.NoError(s.T, err) commandList := map[string]string{ - "cluster-provision.log": "cat /var/log/azure/cluster-provision.log", - "kubelet.log": "journalctl -u kubelet", - "cluster-provision-cse-output.log": "cat /var/log/azure/cluster-provision-cse-output.log", - "sysctl-out.log": "sysctl -a", - "aks-node-controller.log": "cat /var/log/azure/aks-node-controller.log", + "cluster-provision.log": "sudo cat /var/log/azure/cluster-provision.log", + "kubelet.log": "sudo journalctl -u kubelet", + "cluster-provision-cse-output.log": "sudo cat /var/log/azure/cluster-provision-cse-output.log", + "sysctl-out.log": "sudo sysctl -a", + "aks-node-controller.log": "sudo cat /var/log/azure/aks-node-controller.log", } pod, err := s.Runtime.Cluster.Kube.GetHostNetworkDebugPod(ctx, s.T) @@ -129,7 +129,7 @@ func extractLogsFromVMLinux(ctx context.Context, s *Scenario) { var logFiles = map[string]string{} for file, sourceCmd := range commandList { - execResult, err := execOnVM(ctx, s.Runtime.Cluster.Kube, privateIP, pod.Name, string(s.Runtime.SSHKeyPrivate), sourceCmd) + execResult, err := execBashCommandOnVM(ctx, s, privateIP, pod.Name, string(s.Runtime.SSHKeyPrivate), sourceCmd) if err != nil { s.T.Logf("error executing %s: %s", sourceCmd, err) continue From 3298a41c0dc109e317c06a65e0d6f455b1d0d977 Mon Sep 17 00:00:00 2001 From: Devinwong Date: Tue, 28 Jan 2025 11:05:29 -0800 Subject: [PATCH 2/6] bug: add env var CONTAINERD_CONFIG_NO_GPU_CONTENT back for scriptless (#5668) Air-gapped e2e tests failed but other tests succeeded. Unblocking this PR from merging. --- aks-node-controller/parser/helper.go | 37 +++++- aks-node-controller/parser/helper_test.go | 66 ++++++++++- aks-node-controller/parser/parser.go | 3 +- aks-node-controller/parser/parser_test.go | 4 +- .../templates/containerd_no_GPU.toml.gtpl | 105 ++++++++++++++++++ aks-node-controller/proto/README.md | 4 +- 6 files changed, 207 insertions(+), 12 deletions(-) create mode 100644 aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl diff --git a/aks-node-controller/parser/helper.go b/aks-node-controller/parser/helper.go index 68c63d87cd0..c43eda55851 100644 --- a/aks-node-controller/parser/helper.go +++ b/aks-node-controller/parser/helper.go @@ -46,7 +46,13 @@ var ( containerdConfigTemplateText string //nolint:gochecknoglobals containerdConfigTemplate = template.Must( - template.New("containerdconfigforaksnodeconfig").Funcs(getFuncMapForContainerdConfigTemplate()).Parse(containerdConfigTemplateText), + template.New("containerdconfig").Funcs(getFuncMapForContainerdConfigTemplate()).Parse(containerdConfigTemplateText), + ) + //go:embed templates/containerd_no_GPU.toml.gtpl + containerdConfigNoGPUTemplateText string + //nolint:gochecknoglobals + containerdConfigNoGPUTemplate = template.Must( + template.New("nogpucontainerdconfig").Funcs(getFuncMapForContainerdConfigTemplate()).Parse(containerdConfigNoGPUTemplateText), ) ) @@ -139,12 +145,13 @@ func getKubenetTemplate() string { return base64.StdEncoding.EncodeToString(kubenetTemplateContent) } -func getContainerdConfig(aksnodeconfig *aksnodeconfigv1.Configuration) string { +// getContainerdConfigBase64 returns the base64 encoded containerd config depending on whether the node is with GPU or not. +func getContainerdConfigBase64(aksnodeconfig *aksnodeconfigv1.Configuration) string { if aksnodeconfig == nil { return "" } - containerdConfig, err := containerdConfigFromAKSNodeConfig(aksnodeconfig) + containerdConfig, err := containerdConfigFromAKSNodeConfig(aksnodeconfig, false) if err != nil { return fmt.Sprintf("error getting containerd config from node bootstrap variables: %v", err) } @@ -152,13 +159,33 @@ func getContainerdConfig(aksnodeconfig *aksnodeconfigv1.Configuration) string { return base64.StdEncoding.EncodeToString([]byte(containerdConfig)) } -func containerdConfigFromAKSNodeConfig(aksnodeconfig *aksnodeconfigv1.Configuration) (string, error) { +// getNoGPUContainerdConfigBase64 returns the base64 encoded containerd config depending on whether the node is with GPU or not. +func getNoGPUContainerdConfigBase64(aksnodeconfig *aksnodeconfigv1.Configuration) string { + if aksnodeconfig == nil { + return "" + } + + containerdConfig, err := containerdConfigFromAKSNodeConfig(aksnodeconfig, true) + if err != nil { + return fmt.Sprintf("error getting No GPU containerd config from node bootstrap variables: %v", err) + } + + return base64.StdEncoding.EncodeToString([]byte(containerdConfig)) +} + +func containerdConfigFromAKSNodeConfig(aksnodeconfig *aksnodeconfigv1.Configuration, noGPU bool) (string, error) { if aksnodeconfig == nil { return "", fmt.Errorf("AKSNodeConfig is nil") } + // the containerd config template is different based on whether the node is with GPU or not. + _template := containerdConfigTemplate + if noGPU { + _template = containerdConfigNoGPUTemplate + } + var buffer bytes.Buffer - if err := containerdConfigTemplate.Execute(&buffer, aksnodeconfig); err != nil { + if err := _template.Execute(&buffer, aksnodeconfig); err != nil { return "", fmt.Errorf("error executing containerd config template for AKSNodeConfig: %w", err) } diff --git a/aks-node-controller/parser/helper_test.go b/aks-node-controller/parser/helper_test.go index 74a468e25be..90bc200a828 100644 --- a/aks-node-controller/parser/helper_test.go +++ b/aks-node-controller/parser/helper_test.go @@ -249,6 +249,7 @@ func Test_createSortedKeyValueInt32Pairs(t *testing.T) { func Test_getContainerdConfig(t *testing.T) { type args struct { aksnodeconfig *aksnodeconfigv1.Configuration + noGpu bool } tests := []struct { name string @@ -256,7 +257,7 @@ func Test_getContainerdConfig(t *testing.T) { want string }{ { - name: "Default Configuration", + name: "Default Containerd Configurations", args: args{ aksnodeconfig: &aksnodeconfigv1.Configuration{ NeedsCgroupv2: ToPtr(true), @@ -264,6 +265,67 @@ func Test_getContainerdConfig(t *testing.T) { }, want: base64.StdEncoding.EncodeToString([]byte(`version = 2 oom_score = 0 +[plugins."io.containerd.grpc.v1.cri"] + sandbox_image = "" + [plugins."io.containerd.grpc.v1.cri".containerd] + default_runtime_name = "runc" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + BinaryName = "/usr/bin/runc" + SystemdCgroup = true + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted.options] + BinaryName = "/usr/bin/runc" + [plugins."io.containerd.grpc.v1.cri".registry.headers] + X-Meta-Source-Client = ["azure/aks"] +[metrics] + address = "0.0.0.0:10257" +`)), + }, + { + name: "Containerd Configurations with bool noGpu set to false", + args: args{ + aksnodeconfig: &aksnodeconfigv1.Configuration{ + NeedsCgroupv2: ToPtr(true), + GpuConfig: &aksnodeconfigv1.GpuConfig{ + EnableNvidia: ToPtr(true), + }, + }, + noGpu: false, + }, + want: base64.StdEncoding.EncodeToString([]byte(`version = 2 +oom_score = 0 +[plugins."io.containerd.grpc.v1.cri"] + sandbox_image = "" + [plugins."io.containerd.grpc.v1.cri".containerd] + default_runtime_name = "nvidia-container-runtime" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia-container-runtime] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia-container-runtime.options] + BinaryName = "/usr/bin/nvidia-container-runtime" + SystemdCgroup = true + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted.options] + BinaryName = "/usr/bin/nvidia-container-runtime" + [plugins."io.containerd.grpc.v1.cri".registry.headers] + X-Meta-Source-Client = ["azure/aks"] +[metrics] + address = "0.0.0.0:10257" +`)), + }, + { + name: "Containerd Configurations with bool noGpu set to true", + args: args{ + aksnodeconfig: &aksnodeconfigv1.Configuration{ + NeedsCgroupv2: ToPtr(true), + }, + noGpu: true, + }, + want: base64.StdEncoding.EncodeToString([]byte(`version = 2 +oom_score = 0 [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "" [plugins."io.containerd.grpc.v1.cri".containerd] @@ -286,7 +348,7 @@ oom_score = 0 } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if got := getContainerdConfig(tt.args.aksnodeconfig); got != tt.want { + if got := getContainerdConfigBase64(tt.args.aksnodeconfig); got != tt.want { t.Errorf("getContainerdConfig() = %v, want %v", got, tt.want) } }) diff --git a/aks-node-controller/parser/parser.go b/aks-node-controller/parser/parser.go index 5aadb4c7cf0..e60c1d1335d 100644 --- a/aks-node-controller/parser/parser.go +++ b/aks-node-controller/parser/parser.go @@ -158,7 +158,8 @@ func getCSEEnv(config *aksnodeconfigv1.Configuration) map[string]string { "AZURE_ENVIRONMENT_FILEPATH": getAzureEnvironmentFilepath(config), "KUBE_CA_CRT": config.GetKubernetesCaCert(), "KUBENET_TEMPLATE": getKubenetTemplate(), - "CONTAINERD_CONFIG_CONTENT": getContainerdConfig(config), + "CONTAINERD_CONFIG_CONTENT": getContainerdConfigBase64(config), + "CONTAINERD_CONFIG_NO_GPU_CONTENT": getNoGPUContainerdConfigBase64(config), "IS_KATA": fmt.Sprintf("%v", config.GetIsKata()), "ARTIFACT_STREAMING_ENABLED": fmt.Sprintf("%v", config.GetEnableArtifactStreaming()), "SYSCTL_CONTENT": getSysctlContent(config.GetCustomLinuxOsConfig().GetSysctlConfig()), diff --git a/aks-node-controller/parser/parser_test.go b/aks-node-controller/parser/parser_test.go index 31d9f0b1cf0..89f2a057fae 100644 --- a/aks-node-controller/parser/parser_test.go +++ b/aks-node-controller/parser/parser_test.go @@ -47,12 +47,12 @@ func TestBuildCSECmd(t *testing.T) { validator: func(cmd *exec.Cmd) { vars := environToMap(cmd.Env) assert.Equal(t, "false", vars["GPU_NODE"]) - assert.NotEmpty(t, vars["CONTAINERD_CONFIG_CONTENT"]) + assert.NotEmpty(t, vars["CONTAINERD_CONFIG_NO_GPU_CONTENT"]) // Ensure the containerd config does not use the // nvidia container runtime when skipping the // GPU driver install, since it will fail to run even non-GPU // pods, as it will not be installed. - containerdConfigFileContent, err := getBase64DecodedValue([]byte(vars["CONTAINERD_CONFIG_CONTENT"])) + containerdConfigFileContent, err := getBase64DecodedValue([]byte(vars["CONTAINERD_CONFIG_NO_GPU_CONTENT"])) require.NoError(t, err) expectedShimConfig := `version = 2 oom_score = 0 diff --git a/aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl b/aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl new file mode 100644 index 00000000000..0f4bf661edf --- /dev/null +++ b/aks-node-controller/parser/templates/containerd_no_GPU.toml.gtpl @@ -0,0 +1,105 @@ +version = 2 +oom_score = 0{{if getHasDataDir .KubeletConfig}} +root = "{{.KubeletConfig.GetContainerDataDir}}"{{- end}} +[plugins."io.containerd.grpc.v1.cri"] + sandbox_image = "{{ .KubeBinaryConfig.GetPodInfraContainerImageUrl }}" + [plugins."io.containerd.grpc.v1.cri".containerd] + {{- if .TeleportConfig.GetStatus }} + snapshotter = "teleportd" + disable_snapshot_annotations = false + {{- else}} + {{- if .GetIsKata }} + disable_snapshot_annotations = false + {{- end}} + {{- end}} + {{- if .GetEnableArtifactStreaming }} + snapshotter = "overlaybd" + disable_snapshot_annotations = false + {{- end}} + default_runtime_name = "runc" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + BinaryName = "/usr/bin/runc" + {{- if .NeedsCgroupv2 }} + SystemdCgroup = true + {{- end}} + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted.options] + BinaryName = "/usr/bin/runc" + {{- if getIsKrustlet .GetWorkloadRuntime }} + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin] + runtime_type = "io.containerd.spin.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.slight] + runtime_type = "io.containerd.slight-v0-3-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin-v0-3-0] + runtime_type = "io.containerd.spin-v0-3-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.slight-v0-3-0] + runtime_type = "io.containerd.slight-v0-3-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin-v0-5-1] + runtime_type = "io.containerd.spin-v0-5-1.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.slight-v0-5-1] + runtime_type = "io.containerd.slight-v0-5-1.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin-v0-8-0] + runtime_type = "io.containerd.spin-v0-8-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.slight-v0-8-0] + runtime_type = "io.containerd.slight-v0-8-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.wws-v0-8-0] + runtime_type = "io.containerd.wws-v0-8-0.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin-v0-15-1] + runtime_type = "io.containerd.spin.v2" + {{- end}} + {{- if getEnsureNoDupePromiscuousBridge .GetNetworkConfig }} + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/opt/cni/bin" + conf_dir = "/etc/cni/net.d" + conf_template = "/etc/containerd/kubenet_template.conf" + {{- end}} + {{- if isKubernetesVersionGe .GetKubernetesVersion "1.22.0"}} + [plugins."io.containerd.grpc.v1.cri".registry] + config_path = "/etc/containerd/certs.d" + {{- end}} + [plugins."io.containerd.grpc.v1.cri".registry.headers] + X-Meta-Source-Client = ["azure/aks"] +[metrics] + address = "0.0.0.0:10257" +{{- if .TeleportConfig.GetStatus }} +[proxy_plugins] + [proxy_plugins.teleportd] + type = "snapshot" + address = "/run/teleportd/snapshotter.sock" +{{- end}} +{{- if .GetEnableArtifactStreaming }} +[proxy_plugins] + [proxy_plugins.overlaybd] + type = "snapshot" + address = "/run/overlaybd-snapshotter/overlaybd.sock" +{{- end}} +{{- if .GetIsKata }} +[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata] + runtime_type = "io.containerd.kata.v2" +[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli] + runtime_type = "io.containerd.runc.v1" +[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli.options] + NoPivotRoot = false + NoNewKeyring = false + ShimCgroup = "" + IoUid = 0 + IoGid = 0 + BinaryName = "/usr/bin/kata-runtime" + Root = "" + CriuPath = "" + SystemdCgroup = false +[proxy_plugins] + [proxy_plugins.tardev] + type = "snapshot" + address = "/run/containerd/tardev-snapshotter.sock" +[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc] + snapshotter = "tardev" + runtime_type = "io.containerd.kata-cc.v2" + privileged_without_host_devices = true + pod_annotations = ["io.katacontainers.*"] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc.options] + ConfigPath = "/opt/confidential-containers/share/defaults/kata-containers/configuration-clh-snp.toml" +{{- end}} diff --git a/aks-node-controller/proto/README.md b/aks-node-controller/proto/README.md index fd89b3a88cf..289d3e086fb 100644 --- a/aks-node-controller/proto/README.md +++ b/aks-node-controller/proto/README.md @@ -19,7 +19,7 @@ This table is describing the all the AKSNodeConfig Fields converted to .go files | `BootstrappingConfig` | `BootstrappingConfig` | Bootstrap configuration | `ENABLE_TLS_BOOTSTRAPPING`, `ENABLE_SECURE_TLS_BOOTSTRAPPING`, `CUSTOM_SECURE_TLS_BOOTSTRAP_AAD_SERVER_APP_ID` | | `AuthConfig` | `AuthConfig` | Authentication configuration | `TENANT_ID`, `SUBSCRIPTION_ID`, `SERVICE_PRINCIPAL_CLIENT_ID`, `SERVICE_PRINCIPAL_FILE_CONTENT`, `USER_ASSIGNED_IDENTITY_ID`, `USE_MANAGED_IDENTITY_EXTENSION` | | `RuncConfig` | `RuncConfig` | The CLI tool runc configuration | `RUNC_VERSION`, `RUNC_PACKAGE_URL` | -| `ContainerdConfig` | `ContainerdConfig` | Containerd configuration | `CONTAINERD_DOWNLOAD_URL_BASE`, `CONTAINERD_VERSION`, `CONTAINERD_PACKAGE_URL` | +| `ContainerdConfig` | `ContainerdConfig` | Containerd configuration | `CONTAINERD_DOWNLOAD_URL_BASE`, `CONTAINERD_VERSION`, `CONTAINERD_PACKAGE_URL`, `CONTAINERD_CONFIG_CONTENT`, `CONTAINERD_CONFIG_NO_GPU_CONTENT` | | `TeleportConfig` | `TeleportConfig` | Teleport configuration | `TELEPORT_ENABLED`, `TELEPORTD_PLUGIN_DOWNLOAD_URL` | | `KubeletConfig` | `KubeletConfig` | Kubelet configuration | `KUBELET_FLAGS`, `KUBELET_NODE_LABELS`, `HAS_KUBELET_DISK_TYPE`, `KUBELET_CONFIG_FILE_ENABLED`, `KUBELET_CONFIG_FILE_CONTENT`, `KUBELET_CLIENT_CONTENT`, `KUBELET_CLIENT_CERT_CONTENT` | | `CustomSearchDomainConfig` | `CustomSearchDomainConfig` | Custom search domain configuration | `CUSTOM_SEARCH_DOMAIN_NAME`, `CUSTOM_SEARCH_REALM_USER`, `CUSTOM_SEARCH_REALM_PASSWORD` | @@ -52,7 +52,7 @@ This table is describing the all the AKSNodeConfig Fields converted to .go files Removed old environment variables from cse_cmd.sh: -`CSE_HELPERS_FILEPATH`, `CSE_DISTRO_HELPERS_FILEPATH`, `CSE_INSTALL_FILEPATH`, `CSE_DISTRO_INSTALL_FILEPATH`, `CSE_CONFIG_FILEPATH`, `DHCPV6_SERVICE_FILEPATH`, `DHCPV6_CONFIG_FILEPATH`, `NEEDS_DOCKER_LOGIN`, `NEEDS_CONTAINERD`, `CLI_TOOL`, `CONTAINER_RUNTIME`, `MOBY_VERSION`, `HYPERKUBE_URL`, `SGX_NODE` and more. +`CSE_HELPERS_FILEPATH`, `CSE_DISTRO_HELPERS_FILEPATH`, `CSE_INSTALL_FILEPATH`, `CSE_DISTRO_INSTALL_FILEPATH`, `CSE_CONFIG_FILEPATH`, `DHCPV6_SERVICE_FILEPATH`, `DHCPV6_CONFIG_FILEPATH`, `NEEDS_DOCKER_LOGIN`, `NEEDS_CONTAINERD`, `CLI_TOOL`, `CONTAINER_RUNTIME`, `MOBY_VERSION`, `HYPERKUBE_URL`, `SGX_NODE`, `GPU_DRIVER_TYPE` and more. Many variables are changed to optional and we have a builder function as a helper to provide default values. For example, the builder function defaults `LinuxAdminUsername` to value `azureuser`, `OutboundCommand` to a default outbound command `curl -v --insecure --proxy-insecure https://mcr.microsoft.com/v2/`. From d97089b37dc18866e9e5cf52e27fca020751dcb6 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Wed, 29 Jan 2025 09:19:04 +1300 Subject: [PATCH 3/6] chore: cleanup args to e2e exec calls (#5670) --- e2e/exec.go | 39 ++++++++++++++--------------- e2e/validation.go | 4 +-- e2e/validators.go | 63 +++++++++++++++++++++++++++-------------------- e2e/vmss.go | 8 ++++++ 4 files changed, 65 insertions(+), 49 deletions(-) diff --git a/e2e/exec.go b/e2e/exec.go index 5b073ab6bd3..1c7010b4e18 100644 --- a/e2e/exec.go +++ b/e2e/exec.go @@ -105,14 +105,19 @@ func quoteForBash(command string) string { return fmt.Sprintf("'%s'", strings.ReplaceAll(command, "'", "'\"'\"'")) } -func execBashCommandOnVM(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey, command string) (*podExecResult, error) { - image := &config.Image{ - OS: config.OSUbuntu, - } - return execScriptOnVm(ctx, s, vmPrivateIP, jumpboxPodName, sshPrivateKey, []string{command}, image) +type Interpreter string + +const ( + Powershell Interpreter = "powershell" + Bash Interpreter = "bash" +) + +type Script struct { + script string + interpreter Interpreter } -func execScriptOnVm(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey string, script []string, os *config.Image) (*podExecResult, error) { +func execScriptOnVm(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey string, script Script) (*podExecResult, error) { /* This works in a way that doesn't rely on the node having joined the cluster: * We create a linux pod on a different node. @@ -121,31 +126,25 @@ func execScriptOnVm(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodNam * Then we execute the script using an interpreter (powershell or bash) based on the OS of the node. */ identifier := uuid.New().String() + var scriptFileName, remoteScriptFileName, interpreter string - var scriptFileName, remoteScriptFileName string - if os.OS == config.OSWindows { + switch script.interpreter { + case Powershell: + interpreter = "powershell" scriptFileName = fmt.Sprintf("script_file_%s.ps1", identifier) remoteScriptFileName = fmt.Sprintf("c:/%s", scriptFileName) - } else { - scriptFileName = fmt.Sprintf("script_file_%s.sh", identifier) - remoteScriptFileName = scriptFileName - } - - var interpreter string - switch os.OS { - case config.OSWindows: - interpreter = "powershell" break default: interpreter = "bash" + scriptFileName = fmt.Sprintf("script_file_%s.sh", identifier) + remoteScriptFileName = scriptFileName break } - scriptWithLineBreaks := strings.Join(script, "\n") steps := []string{ fmt.Sprintf("echo '%[1]s' > %[2]s", sshPrivateKey, sshKeyName(vmPrivateIP)), "set -x", - fmt.Sprintf("echo %[1]s > %[2]s", quoteForBash(scriptWithLineBreaks), scriptFileName), + fmt.Sprintf("echo %[1]s > %[2]s", quoteForBash(script.script), scriptFileName), fmt.Sprintf("chmod 0600 %s", sshKeyName(vmPrivateIP)), fmt.Sprintf("chmod 0755 %s", scriptFileName), fmt.Sprintf(`scp -i %[1]s -o PasswordAuthentication=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 %[3]s azureuser@%[2]s:%[4]s`, sshKeyName(vmPrivateIP), vmPrivateIP, scriptFileName, remoteScriptFileName), @@ -154,7 +153,7 @@ func execScriptOnVm(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodNam joinedSteps := strings.Join(steps, " && ") - s.T.Log(fmt.Sprintf("Executing script %s:\n---START-SCRIPT---\n%s\n---END-SCRIPT---\n", scriptFileName, scriptWithLineBreaks)) + s.T.Log(fmt.Sprintf("Executing script %s:\n---START-SCRIPT---\n%s\n---END-SCRIPT---\n", scriptFileName, script)) kube := s.Runtime.Cluster.Kube execResult, err := execOnPrivilegedPod(ctx, kube, defaultNamespace, jumpboxPodName, joinedSteps) diff --git a/e2e/validation.go b/e2e/validation.go index bc112ca65a5..25d595845be 100644 --- a/e2e/validation.go +++ b/e2e/validation.go @@ -34,7 +34,7 @@ func ValidateWASM(ctx context.Context, s *Scenario, nodeName string) { } func ValidateCommonLinux(ctx context.Context, s *Scenario) { - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/default/kubelet"}, 0, "could not read kubelet config") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo cat /etc/default/kubelet", 0, "could not read kubelet config") 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") @@ -62,7 +62,7 @@ func ValidateCommonLinux(ctx context.Context, s *Scenario) { //"cloud-config.txt", // file with UserData }) - execResult = execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo curl http://168.63.129.16:32526/vmSettings"}, 0, "curl to wireserver failed") + execResult = 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 5e84f275726..c7f697da81c 100644 --- a/e2e/validators.go +++ b/e2e/validators.go @@ -18,11 +18,11 @@ import ( ) func ValidateDirectoryContent(ctx context.Context, s *Scenario, path string, files []string) { - command := []string{ + steps := []string{ "set -ex", fmt.Sprintf("sudo ls -la %s", path), } - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not get directory contents") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "could not get directory contents") stdout := execResult.stdout.String() for _, file := range files { require.Contains(s.T, stdout, file, "expected to find file %s within directory %s, but did not.\nDirectory contents:\n%s", file, path, stdout) @@ -38,7 +38,7 @@ func ValidateSysctlConfig(ctx context.Context, s *Scenario, customSysctls map[st "set -ex", fmt.Sprintf("sudo sysctl %s | sed -E 's/([0-9])\\s+([0-9])/\\1 \\2/g'", strings.Join(keysToCheck, " ")), } - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "systmctl command failed") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 0, "systmctl command failed") stdout := execResult.stdout.String() for name, value := range customSysctls { require.Contains(s.T, stdout, fmt.Sprintf("%s = %v", name, value), "expected to find %s set to %v, but was not.\nStdout:\n%s", name, value, stdout) @@ -50,14 +50,14 @@ func ValidateNvidiaSMINotInstalled(ctx context.Context, s *Scenario) { "set -ex", "sudo nvidia-smi", } - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 1, "") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 1, "") stderr := execResult.stderr.String() require.Contains(s.T, stderr, "nvidia-smi: command not found", "expected stderr to contain 'nvidia-smi: command not found', but got %q", stderr) } func ValidateNvidiaSMIInstalled(ctx context.Context, s *Scenario) { command := []string{"set -ex", "sudo nvidia-smi"} - execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not execute nvidia-smi command") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 0, "could not execute nvidia-smi command") } func ValidateNvidiaModProbeInstalled(ctx context.Context, s *Scenario) { @@ -65,7 +65,7 @@ func ValidateNvidiaModProbeInstalled(ctx context.Context, s *Scenario) { "set -ex", "sudo nvidia-modprobe", } - execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "cound not execute nvidia-modprobe command") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 0, "cound not execute nvidia-modprobe command") } func ValidateNonEmptyDirectory(ctx context.Context, s *Scenario, dirName string) { @@ -73,7 +73,7 @@ func ValidateNonEmptyDirectory(ctx context.Context, s *Scenario, dirName string) "set -ex", fmt.Sprintf("sudo ls -1q %s | grep -q '^.*$' && true || false", dirName), } - execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "either could not find expected file, or something went wrong") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(command, "\n"), 0, "either could not find expected file, or something went wrong") } func ValidateFileHasContent(ctx context.Context, s *Scenario, fileName string, contents string) { @@ -84,7 +84,7 @@ func ValidateFileHasContent(ctx context.Context, s *Scenario, fileName string, c fmt.Sprintf("if (Select-String -Path %s -Pattern \"%s\" -SimpleMatch -Quiet) { return 1 } else { return 0 }", fileName, contents), } - execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") } else { steps := []string{ "set -ex", @@ -93,7 +93,7 @@ func ValidateFileHasContent(ctx context.Context, s *Scenario, fileName string, c fmt.Sprintf("(sudo cat %[1]s | grep -q -F -e %[2]q)", fileName, contents), } - execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "could not validate file has contents - might mean file does not have contents, might mean something went wrong") } } @@ -107,7 +107,7 @@ func ValidateFileExcludesContent(ctx context.Context, s *Scenario, fileName stri fmt.Sprintf("sudo cat %[1]s", fileName), fmt.Sprintf("(sudo cat %[1]s | grep -q -v -F -e %[2]q)", fileName, contents), } - execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate file excludes contents - might mean file does have contents, might mean something went wrong") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "could not validate file excludes contents - might mean file does have contents, might mean something went wrong") } func ServiceCanRestartValidator(ctx context.Context, s *Scenario, serviceName string, restartTimeoutInSeconds int) { @@ -139,7 +139,7 @@ func ServiceCanRestartValidator(ctx context.Context, s *Scenario, serviceName st "if [[ \"$INITIAL_PID\" == \"$POST_PID\" ]]; then echo PID did not change after restart, failing validator. ; exit 1; fi", } - execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "command to restart service failed") + execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "command to restart service failed") } func ValidateUlimitSettings(ctx context.Context, s *Scenario, ulimits map[string]string) { @@ -149,7 +149,7 @@ func ValidateUlimitSettings(ctx context.Context, s *Scenario, ulimits map[string } command := fmt.Sprintf("sudo systemctl cat containerd.service | grep -E -i '%s'", strings.Join(ulimitKeys, "|")) - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 0, "could not read containerd.service file") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not read containerd.service file") for name, value := range ulimits { require.Contains(s.T, execResult.stdout.String(), fmt.Sprintf("%s=%v", name, value), "expected to find %s set to %v, but was not", name, value) @@ -164,13 +164,22 @@ func execOnVMForScenarioOnUnprivilegedPod(ctx context.Context, s *Scenario, cmd return execResult } -func execScriptOnVMForScenario(ctx context.Context, s *Scenario, cmd []string) *podExecResult { - result, err := execScriptOnVm(ctx, s, s.Runtime.VMPrivateIP, s.Runtime.DebugHostPod, string(s.Runtime.SSHKeyPrivate), cmd, s.VHD) +func execScriptOnVMForScenario(ctx context.Context, s *Scenario, cmd string) *podExecResult { + script := Script{ + script: cmd, + } + if s.VHD.OS == config.OSWindows { + script.interpreter = Powershell + } else { + script.interpreter = Bash + } + + result, err := execScriptOnVm(ctx, s, s.Runtime.VMPrivateIP, s.Runtime.DebugHostPod, string(s.Runtime.SSHKeyPrivate), script) require.NoError(s.T, err, "failed to execute command on VM") return result } -func execScriptOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, cmd []string, expectedExitCode int, additionalErrorMessage string) *podExecResult { +func execScriptOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, cmd string, expectedExitCode int, additionalErrorMessage string) *podExecResult { execResult := execScriptOnVMForScenario(ctx, s, cmd) expectedExitCodeStr := fmt.Sprint(expectedExitCode) @@ -181,15 +190,15 @@ func execScriptOnVMForScenarioValidateExitCode(ctx context.Context, s *Scenario, func ValidateInstalledPackageVersion(ctx context.Context, s *Scenario, component, version string) { s.T.Logf("assert %s %s is installed on the VM", component, version) - installedCommand := func() []string { + installedCommand := func() string { switch s.VHD.OS { case config.OSUbuntu: - return []string{"sudo apt list --installed"} + return "sudo apt list --installed" case config.OSMariner, config.OSAzureLinux: - return []string{"sudo dnf list installed"} + return "sudo dnf list installed" default: s.T.Fatalf("command to get package list isn't implemented for OS %s", s.VHD.OS) - return []string{""} + return "" } }() execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, installedCommand, 0, "could not get package list") @@ -208,7 +217,7 @@ func ValidateInstalledPackageVersion(ctx context.Context, s *Scenario, component } func ValidateKubeletNodeIP(ctx context.Context, s *Scenario) { - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/default/kubelet"}, 0, "could not read kubelet config") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo cat /etc/default/kubelet", 0, "could not read kubelet config") stdout := execResult.stdout.String() // Search for "--node-ip" flag and its value. @@ -228,11 +237,11 @@ func ValidateKubeletNodeIP(ctx context.Context, s *Scenario) { func ValidateIMDSRestrictionRule(ctx context.Context, s *Scenario, table string) { cmd := fmt.Sprintf("sudo iptables -t %s -S | grep -q 'AKS managed: added by AgentBaker ensureIMDSRestriction for IMDS restriction feature'", table) - execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{cmd}, 0, "expected to find IMDS restriction rule, but did not") + execScriptOnVMForScenarioValidateExitCode(ctx, s, cmd, 0, "expected to find IMDS restriction rule, but did not") } func ValidateMultipleKubeProxyVersionsExist(ctx context.Context, s *Scenario) { - execResult := execScriptOnVMForScenario(ctx, s, []string{"sudo ctr --namespace k8s.io images list | grep kube-proxy | awk '{print $1}' | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+'"}) + execResult := execScriptOnVMForScenario(ctx, s, "sudo ctr --namespace k8s.io images list | grep kube-proxy | awk '{print $1}' | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+'") if execResult.exitCode != "0" { s.T.Errorf("Failed to list kube-proxy images: %s", execResult.stderr) return @@ -257,7 +266,7 @@ func ValidateMultipleKubeProxyVersionsExist(ctx context.Context, s *Scenario) { } func ValidateContainerdWASMShims(ctx context.Context, s *Scenario) { - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{"sudo cat /etc/containerd/config.toml"}, 0, "could not get containerd config content") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo cat /etc/containerd/config.toml", 0, "could not get containerd config content") expectedShims := []string{ `[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]`, `runtime_type = "io.containerd.spin.v2"`, @@ -290,7 +299,7 @@ func ValidateContainerdWASMShims(ctx context.Context, s *Scenario) { func ValidateKubeletHasNotStopped(ctx context.Context, s *Scenario) { command := "sudo journalctl -u kubelet" - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 0, "could not retrieve kubelet logs") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 0, "could not retrieve kubelet logs") assert.NotContains(s.T, execResult.stdout.String(), "Stopped Kubelet") assert.Contains(s.T, execResult.stdout.String(), "Started Kubelet") } @@ -298,12 +307,12 @@ func ValidateKubeletHasNotStopped(ctx context.Context, s *Scenario) { func ValidateServicesDoNotRestartKubelet(ctx context.Context, s *Scenario) { // grep all filesin /etc/systemd/system/ for /restart\s+kubelet/ and count results command := "sudo grep -rl 'restart[[:space:]]\\+kubelet' /etc/systemd/system/" - execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{command}, 1, "expected to find no services containing 'restart kubelet' in /etc/systemd/system/") + execScriptOnVMForScenarioValidateExitCode(ctx, s, command, 1, "expected to find no services containing 'restart kubelet' in /etc/systemd/system/") } // ValidateKubeletHasFlags checks kubelet is started with the right flags and configs. func ValidateKubeletHasFlags(ctx context.Context, s *Scenario, filePath string) { - execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, []string{`sudo journalctl -u kubelet`}, 0, "could not get kubelet logs") + execResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, "sudo journalctl -u kubelet", 0, "could not get kubelet logs") configFileFlags := fmt.Sprintf("FLAG: --config=\"%s\"", filePath) require.Containsf(s.T, execResult.stdout.String(), configFileFlags, "expected to find flag %s, but not found", "config") } @@ -379,7 +388,7 @@ func ValidateWindowsProcessHasCliArguments(ctx context.Context, s *Scenario, pro fmt.Sprintf("(Get-CimInstance Win32_Process -Filter \"name='%[1]s'\")[0].CommandLine", processName), } - podExecResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, steps, 0, "could not validate command has parameters - might mean file does not have params, might mean something went wrong") + podExecResult := execScriptOnVMForScenarioValidateExitCode(ctx, s, strings.Join(steps, "\n"), 0, "could not validate command has parameters - might mean file does not have params, might mean something went wrong") actualArgs := strings.Split(podExecResult.stdout.String(), " ") diff --git a/e2e/vmss.go b/e2e/vmss.go index aad32a58d27..c66024dccf5 100644 --- a/e2e/vmss.go +++ b/e2e/vmss.go @@ -140,6 +140,14 @@ func extractLogsFromVMLinux(ctx context.Context, s *Scenario) { require.NoError(s.T, err) } +func execBashCommandOnVM(ctx context.Context, s *Scenario, vmPrivateIP, jumpboxPodName, sshPrivateKey, command string) (*podExecResult, error) { + script := Script{ + interpreter: Bash, + script: command, + } + return execScriptOnVm(ctx, s, vmPrivateIP, jumpboxPodName, sshPrivateKey, script) +} + const uploadLogsPowershellScript = ` param( [string]$arg1, From 05db0c8e6d405772fe9be2a6f73f8514d7dbb6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Uma=C5=84ski?= Date: Tue, 28 Jan 2025 13:20:18 -0800 Subject: [PATCH 4/6] chore: adjust apt-get regex looking for errors (#5669) Co-authored-by: Mikolaj Umanski --- parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Containerd/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=false/line18.sh | 4 ++-- .../AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1604+Disable1804SystemdResolved=true/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+Docker/line18.sh | 4 ++-- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData | 2 +- .../testdata/AKSUbuntu1604+DynamicKubeletConfig/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S115/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S117/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+K8S118/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line18.sh | 4 ++-- .../testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData | 2 +- .../testdata/AKSUbuntu1604+TempDisk+Containerd/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData | 2 +- .../AKSUbuntu1804+Containerd++GPU+runcshimv2/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd+ContainerdVersion/CustomData | 2 +- .../AKSUbuntu1804+Containerd+ContainerdVersion/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData | 2 +- .../AKSUbuntu1804+Containerd+IPAddress+FQDN/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+Calico/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData | 2 +- .../AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line18.sh | 4 ++-- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData | 2 +- .../AKSUbuntu1804+Containerd+MIG+NoFabricManager/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+NSeriesSku/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+PrivateACR/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+Teleport/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+Teleport/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData | 2 +- .../testdata/AKSUbuntu1804+Containerd+runcshimv2/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line18.sh | 4 ++-- .../AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=false/line18.sh | 4 ++-- .../AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData | 2 +- .../AKSUbuntu1804+Disable1804SystemdResolved=true/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line18.sh | 4 ++-- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData | 2 +- .../AKSUbuntu1804+KubeletClientTLSBootstrapping/line18.sh | 4 ++-- .../testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData | 2 +- .../testdata/AKSUbuntu1804+NoArtifactStreaming/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu1804+krustlet/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData | 2 +- .../testdata/AKSUbuntu1804Containerd+RuncVersion/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+China/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+China/line18.sh | 4 ++-- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData | 2 +- .../AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line18.sh | 4 ++-- .../CustomData | 2 +- .../AKSUbuntu2204+CustomCloud+ootcredentialprovider/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line18.sh | 4 ++-- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line18.sh | 4 ++-- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData | 2 +- .../AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- .../CustomData | 2 +- .../AKSUbuntu2204+KubeletServingCertificateRotation/line18.sh | 4 ++-- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData | 2 +- .../testdata/AKSUbuntu2204+OutboundTypeBlocked/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line18.sh | 4 ++-- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData | 2 +- .../testdata/AKSUbuntu2204+SecureTLSBoostrapping/line18.sh | 4 ++-- .../CustomData | 2 +- .../line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line18.sh | 4 ++-- .../testdata/AKSUbuntu2204+SerializeImagePulls/CustomData | 2 +- .../testdata/AKSUbuntu2204+SerializeImagePulls/line18.sh | 4 ++-- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData | 2 +- pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line18.sh | 4 ++-- .../testdata/AKSUbuntu2204+ootcredentialprovider/CustomData | 2 +- .../testdata/AKSUbuntu2204+ootcredentialprovider/line18.sh | 4 ++-- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData | 2 +- .../AKSUbuntu2404+CustomLinuxOSConfigUlimit/line18.sh | 4 ++-- pkg/agent/testdata/CustomizedImage/CustomData | 2 +- pkg/agent/testdata/CustomizedImage/line18.sh | 4 ++-- pkg/agent/testdata/CustomizedImageKata/CustomData | 2 +- pkg/agent/testdata/CustomizedImageKata/line18.sh | 4 ++-- pkg/agent/testdata/RawUbuntu/CustomData | 2 +- pkg/agent/testdata/RawUbuntu/line18.sh | 4 ++-- pkg/agent/testdata/RawUbuntuContainerd/CustomData | 2 +- pkg/agent/testdata/RawUbuntuContainerd/line18.sh | 4 ++-- 153 files changed, 230 insertions(+), 230 deletions(-) diff --git a/parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh b/parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh index 6cff2327aeb..063581e21ee 100755 --- a/parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh +++ b/parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 1a8daabb8dd..a3e39b33e0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 44427a7f6e6..796420ff606 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 44427a7f6e6..796420ff606 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index f42d4b6290e..643673a9a71 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index f42d4b6290e..643673a9a71 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 1a8daabb8dd..a3e39b33e0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 3fa5b4c6f0c..8a1a280e2a9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 33a6a5fc39c..1c49f400f74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 1a8daabb8dd..a3e39b33e0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 44427a7f6e6..796420ff606 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 1a8daabb8dd..a3e39b33e0c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 08f58b8e365..234b4b8aeaf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 4035b397d94..408fb3fd53f 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 08f58b8e365..234b4b8aeaf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line18.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 1e8ebdb9a3c..dd9cb877898 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 25fd46331e1..634a803589f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index b461ed19f2d..163bbbe025f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 0cfd2a140b6..29fb2355d42 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 1e8ebdb9a3c..dd9cb877898 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 1e8ebdb9a3c..dd9cb877898 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index d1383311827..d2a72454c17 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index f0f4503e3b0..da412333bf2 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index ee3baea67c2..a90ffd21c00 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 25fd46331e1..634a803589f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 16f1b0a8a7f..8debc37e778 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line18.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index cf674727eab..997415a69d5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line18.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 18ce8627d4f..a57d90ea70b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line18.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line18.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 3d0eb06585c..3e428770422 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index cb891f24e69..e928ff4852c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData index 13120878622..2aa3f5aee98 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 7647b676637..d307e3d9d66 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 2c7d548238e..93b64066871 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData index 2c7d548238e..93b64066871 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+SerializeImagePulls/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 2c7d548238e..93b64066871 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation+CustomKubeletConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData index 0436c37f937..4b1db900a67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+DisableKubeletServingCertificateRotation/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOff/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithFilterTable/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+IMDSRestrictionOnWithMangleTable/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ImplicitlyDisableKubeletServingCertificateRotation/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData index 2c7d548238e..93b64066871 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation+CustomKubeletConfig/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData index b65e3ce034e..bc1a8a8a5b5 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+KubeletServingCertificateRotation/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeBlocked/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNil/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+OutboundTypeNone/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index d6619f05c8d..f5c35151e01 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 9d8c01e3afd..ca2b894490a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 3b205c16b4e..b696f29da22 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData index b54ae5ebb47..66dbe777fb6 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SerializeImagePulls/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index ebaa5774065..f20e2d1af32 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData index cf0caca4302..c3b40a75f8a 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line18.sh b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+ootcredentialprovider/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData index 44427a7f6e6..796420ff606 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line18.sh b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line18.sh +++ b/pkg/agent/testdata/AKSUbuntu2404+CustomLinuxOSConfigUlimit/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index c74e3590fdf..20db1a08210 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 diff --git a/pkg/agent/testdata/CustomizedImage/line18.sh b/pkg/agent/testdata/CustomizedImage/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/CustomizedImage/line18.sh +++ b/pkg/agent/testdata/CustomizedImage/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index c74e3590fdf..20db1a08210 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 diff --git a/pkg/agent/testdata/CustomizedImageKata/line18.sh b/pkg/agent/testdata/CustomizedImageKata/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line18.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 1a8daabb8dd..a3e39b33e0c 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/RawUbuntu/line18.sh b/pkg/agent/testdata/RawUbuntu/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/RawUbuntu/line18.sh +++ b/pkg/agent/testdata/RawUbuntu/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index d5108749e28..7911ae84ef5 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -15,7 +15,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZBkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDEMDBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxm/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4P/Vur4Kb4/337afWtch3l5fqun/hXS/+2/bxG/D3l69PexfzMymqHt7MFTIRvO9tF3cdNttAoQDxW+N37C6R+qlrZSAztzsQmONxlHTWO8SR0mDWniPcWUwgRWTCAfDx6i3nSZzzGrD1zgjne50oJtHjxx2XURZmR553wWd89T5svzwv6GtThuohEE5yo6PL0rDpdDHxz1/caw72SgVktYjqMJYjscoEm15JY8fn7fg8WPrv6SYskDm67HUu3xifCcwjRHbc7zxyccbv2Gq+zJUZaUy/FmQqnMAMnuYWetc2JGw/56k3XCpc/o3UNhLVFSVmWLJjI2lomZ1i5qNhc0KaC2oy9sObGzhYncmduVhezFrrmc6lxN7YfJWyttLnAic+LCYvv3CajHc4N+PlMSmwm2Ku87qP8m9HUFeQnitEDpIa0Q3A7rk0EIZ3IhmvUADHP7B4hHL8ETJ8Qkv5mfXIPwUnZyehT3S+e6bub2Y/3JwMIfiwXIxO3DJ4yz2M1DKikJOaCInws1cL1zYya9ABcLB+gV7yauUe8/e6/DixPs7AAD//+/bPOXWDAAA + H4sIAAAAAAAC/+SWb2/bNhDG3+tTXFUitYsyilNkL2K4qwsrW4AgGdIWGZCkAi2dJMIyqZJUnCDJdx9Iy/L/xV1fDMMCBJbIhyfewx95fP0qGHIRDJnOPQ/jXIL/WVYq5iKDWGOUY1Gi0lHCtVFyX+eQSgVfh5Uwle95HivNmKnRVf+Mi+q+n6EwrTY8egAALhxpJcxg+x1p5VIbwcbYfgfaMGX660PBJx3fjZ0wbqJUqoiVJipkPNKuWaFRD/E4iXgapYwXlULoHB7AERweASsNtRGBdGDCChuVuahPT3DjhvMUrq/dR6DXAz+XReLD7W0XTI7CKdy877kBEl5eRr9fnA2iq/7Z6fnXP/u/hedfpnkVK3Eq8WKky/As7H8Ot0RM+QuGoUi22vXseetuNYswyXmBkFYaFQR3TAUFHwZJOcoCq5s3sdIEBddGL7THLM7R9TAV5/wO684PQYJ3gaiKAg4/7HW6kMh5yjaHN1eMG4uQhUVhgUwjyNSuELjpvWn0ukAs4b17T6RA79kyFWVooqq0TjSZ2LXnqHudA/dqVVNFJCtTVqYXmHFpZ0szNHTatS8rM3VYKuDABZCWxu/QAVKHay/Nfgt207UspTIwCD+d9s+jk8uL8y/h+aAnpODCoGKx4XfYqK3DQGksRcozSyllQGkqVYyuMcG00dZTBpoCfQAutGFF0fS+gtZMMM3JeQ5PYBCBrLkAT5ApLIGG4H9rXV+Ft8f7b9tP31rXId5eX6rp/4V0v/tv28Rvw95evT/sX8zMprB7ezBUyEbzzbRd3HTbfQKEA8XvjeGwuknqta2UgM7c7UJjzcZR01hvE4dJw1p4j3FlMIEVlwgHw8eotx0nc85qx9dAI53udKCbR48cdl1EWZkeed8FnfPU+bL88J/BrU4bqIRBOcqOjy9Kw6XQx8c9f3GsO9ooFZLWI6jCWI7HKBJtgSWPH5+34PFz67+kmLJA5uux1Lt8ZPwgMI0R23O88cnHG79hqvsyVGWlMvy/IFXnAGT2MLPWubAjYf8+SbvhUuf0T6Cwt6ioKjPFkhkbS1XN6hY1GyubFdBaUNe3HdjYwsXuTOzKw/Zq1tzPdC4n9sbkrdS3lzgROPFhMX37hdVquMG/n6qJTYnbFHgd1r+TezuSvMTwWiV0lNaMbiZ0yaKFOriRzXqFBjj8g8UjluGJkuMTXswPr0H4KTo5PQt7pPPDd3N7Nf/l4GBOxYMFY3biksdZ7GeglBWFnNBEToSbuV64spNfgQqEg/Ur9pJXKfeevdfhxYn3VwAAAP//q0AABNgMAAA= - path: /opt/azure/containers/provision_start.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line18.sh b/pkg/agent/testdata/RawUbuntuContainerd/line18.sh index 6cff2327aeb..063581e21ee 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line18.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line18.sh @@ -29,7 +29,7 @@ apt_get_update() { export DEBIAN_FRONTEND=noninteractive dpkg --configure -a --force-confdef apt-get -f -y install - ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get update 2>&1 | tee $apt_update_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_update_output && break || \ cat $apt_update_output if [ $i -eq $retries ]; then @@ -82,7 +82,7 @@ apt_get_dist_upgrade() { dpkg --configure -a --force-confdef apt-get -f -y install apt-mark showhold - ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|([Ee][Rr][Rr][Oo][Rr].*)$") && \ + ! (apt-get -o Dpkg::Options::="--force-confnew" dist-upgrade -y 2>&1 | tee $apt_dist_upgrade_output | grep -E "^([WE]:.*)|^([Ee][Rr][Rr][Oo][Rr].*)$") && \ cat $apt_dist_upgrade_output && break || \ cat $apt_dist_upgrade_output if [ $i -eq $retries ]; then From beba1e5188bf43ffbe6256965f8adfe39adbf4d6 Mon Sep 17 00:00:00 2001 From: yagmurbaydogan <43731029+yagmurbaydogan@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:35:29 -0800 Subject: [PATCH 5/6] Add release notes for security patch 20250105T000000Z (#5673) --- .../release_notes_delta_20250105T000000Z.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 vhdbuilder/release-notes/security-patch/20250105T000000Z/release_notes_delta_20250105T000000Z.txt diff --git a/vhdbuilder/release-notes/security-patch/20250105T000000Z/release_notes_delta_20250105T000000Z.txt b/vhdbuilder/release-notes/security-patch/20250105T000000Z/release_notes_delta_20250105T000000Z.txt new file mode 100644 index 00000000000..4fe1000dc8e --- /dev/null +++ b/vhdbuilder/release-notes/security-patch/20250105T000000Z/release_notes_delta_20250105T000000Z.txt @@ -0,0 +1,11 @@ +Release notes for security patch 20250105T000000Z timestamp +Package difference between 20241205T000000Z and 20250105T000000Z +Upgrade: linux-tools-common:amd64 (5.15.0-125.135, 5.15.0-127.137) +Upgrade: libgstreamer1.0-0:amd64 (1.20.3-0ubuntu1, 1.20.3-0ubuntu1.1) +Upgrade: libcurl4:amd64 (7.81.0-1ubuntu1.19, 7.81.0-1ubuntu1.20), curl:amd64 (7.81.0-1ubuntu1.19, 7.81.0-1ubuntu1.20) +Upgrade: libexpat1:amd64 (2.4.7-1ubuntu0.4, 2.4.7-1ubuntu0.5) +Upgrade: needrestart:amd64 (3.5-5ubuntu2.3, 3.5-5ubuntu2.4) +Upgrade: linux-cloud-tools-common:amd64 (5.15.0-125.135, 5.15.0-127.137) +Upgrade: linux-libc-dev:amd64 (5.15.0-125.135, 5.15.0-127.137) +Upgrade: libcurl3-gnutls:amd64 (7.81.0-1ubuntu1.19, 7.81.0-1ubuntu1.20) + From 947a7c16751c10262d0d12dd7825f7cfddc66c77 Mon Sep 17 00:00:00 2001 From: Ximeng Zhao <112792872+xmzhao0822@users.noreply.github.com> Date: Tue, 28 Jan 2025 14:48:52 -0800 Subject: [PATCH 6/6] Add e2etest ubuntu2204 gpunodriver scriptless (#5671) --- e2e/scenario_test.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/e2e/scenario_test.go b/e2e/scenario_test.go index 47895007509..8c480b0547d 100644 --- a/e2e/scenario_test.go +++ b/e2e/scenario_test.go @@ -957,6 +957,36 @@ func Test_Ubuntu2204_GPUNoDriver(t *testing.T) { }) } +func Test_Ubuntu2204_GPUNoDriver_Scriptless(t *testing.T) { + RunScenario(t, &Scenario{ + Description: "Tests that a GPU-enabled node using the Ubuntu 2204 VHD opting for skipping gpu driver installation can be properly bootstrapped", + Tags: Tags{ + GPU: true, + }, + Config: Config{ + Cluster: ClusterKubenet, + VHD: config.VHDUbuntu2204Gen2Containerd, + AKSNodeConfigMutator: func(config *aksnodeconfigv1.Configuration) { + config.VmSize = "Standard_NC6s_v3" + config.GpuConfig.ConfigGpuDriver = true + config.GpuConfig.GpuDevicePlugin = false + config.GpuConfig.EnableNvidia = to.Ptr(true) + }, + VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) { + // this vmss tag is needed since there is a logic in cse_main.sh otherwise the test will fail + vmss.Tags = map[string]*string{ + // deliberately case mismatched to agentbaker logic to check case insensitivity + "SkipGPUDriverInstall": to.Ptr("true"), + } + vmss.SKU.Name = to.Ptr("Standard_NC6s_v3") + }, + Validator: func(ctx context.Context, s *Scenario) { + ValidateNvidiaSMINotInstalled(ctx, s) + }, + }, + }) +} + func Test_Ubuntu2204_PrivateKubePkg(t *testing.T) { RunScenario(t, &Scenario{ Description: "Tests that a node using the Ubuntu 2204 VHD that was built with private kube packages can be properly bootstrapped with the specified kube version",