Merge branch 'dev' into jasonjung/test-query-0

Azure · Dec 27, 2024 · ffba85b · ffba85b
2 parents 177c242 + a049e44
commit ffba85b
Show file tree

Hide file tree

Showing 112 changed files with 438 additions and 402 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -73,8 +73,8 @@
       "assignees": ["devinwong", "anujmaheshwari1", "cameronmeissner", "AlisonB319", "lilypan26", "djsly", "jason1028kr", "UtheMan", "zachary-bailey", "ganeshkumarashok"]
     },
     {
-      "matchPackageNames": ["azure-cni", "azure-cns", "containernetworking/azure-cni", "containernetworking/azure-cns"],
-      "assignees": ["rbtr", "behzad-mir", "QxBytes"]
+      "matchPackageNames": ["azure-cni", "azure-cns", "containernetworking/azure-cni", "containernetworking/azure-cns", "containernetworking/cilium/cilium"],
+      "assignees": ["rbtr", "behzad-mir", "QxBytes", "jpayne3506"]
     },
     {
       "matchPackageNames": ["aks/aks-node-ca-watcher"],

diff --git a/.pipelines/.vsts-vhd-builder-release-windows.yaml b/.pipelines/.vsts-vhd-builder-release-windows.yaml
@@ -21,6 +21,8 @@ pr:
     - vhdbuilder/packer/init-variables.sh
     - vhdbuilder/packer/windows-image.env
     - vhdbuilder/packer/windows-vhd-builder-sig.json
+    exclude:
+    - vhdbuilder/release-notes
 
 pool:
   name: $(AZURE_POOL_NAME)
@@ -55,121 +57,69 @@ parameters:
   type: boolean
   default: False
 
+variables:
+  VHD_BUILD_ID: $(Build.BuildId)
+  LOCATION: $(PACKER_BUILD_LOCATION)
+
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build"
 # Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build - PR check-in gate"
 # Use variable group "ab-windows-ms-tenant" and link it to the pipeline "[TEST All VHDs] AKS Windows VHD Build - Msft Tenant"
 
 stages:
-  - stage: build
-    jobs:
-      - job: build_vhd_2019_containerd
-        dependsOn: []
-        condition: eq('${{ parameters.build2019containerd }}', True)
-        timeoutInMinutes: 180
-        steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{parameters.vhddebug}}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4s_v3'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]2019-containerd'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_2019_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2019_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2019_CORE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
-          - template: ./templates/.builder-release-template-windows.yaml
-            parameters:
-              artifactName: 2019-containerd
+  - template: ./templates/.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_2019_v1
+      artifactName: 2019-containerd
+      imageName: windows-2019-containerd
+      windowsSku: 2019-containerd
+      hyperVGeneration: V1
+      build: ${{ parameters.build2019containerd }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
 
-      - job: build_vhd_2022_containerd
-        dependsOn: []
-        condition: eq('${{ parameters.build2022containerd }}', True)
-        timeoutInMinutes: 180
-        steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{parameters.vhddebug}}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4s_v3'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]2022-containerd'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_2022_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
-          - template: ./templates/.builder-release-template-windows.yaml
-            parameters:
-              artifactName: 2022-containerd
+  - template: ./templates/.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_2022_v1
+      artifactName: 2022-containerd
+      imageName: windows-2022-containerd
+      windowsSku: 2022-containerd
+      hyperVGeneration: V1
+      build: ${{ parameters.build2022containerd }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
 
-      - job: build_vhd_2022_containerd_gen2
-        dependsOn: []
-        condition: eq('${{ parameters.build2022containerdgen2 }}', True)
-        timeoutInMinutes: 180
-        steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{parameters.vhddebug}}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4s_v3'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]2022-containerd-gen2'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_2022_GEN2_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
-          - template: ./templates/.builder-release-template-windows.yaml
-            parameters:
-              artifactName: 2022-containerd-gen2
+  - template: ./templates/.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_2022_v2
+      artifactName: 2022-containerd-gen2
+      imageName: windows-2022-containerd-gen2
+      windowsSku: 2022-containerd-gen2
+      hyperVGeneration: V2
+      build: ${{ parameters.build2022containerdgen2 }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
 
-      - job: build_vhd_23H2
-        dependsOn: []
-        condition: eq('${{ parameters.build23H2 }}', True)
-        timeoutInMinutes: 180
-        steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{parameters.vhddebug}}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4s_v3'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]23H2'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_23H2_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
-          - template: ./templates/.builder-release-template-windows.yaml
-            parameters:
-              artifactName: 23H2
+  - template: ./templates/.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_23H2_v1
+      artifactName: 23H2
+      imageName: windows-23H2
+      windowsSku: 23H2
+      hyperVGeneration: V1
+      build: ${{ parameters.build23H2 }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
 
-      - job: build_vhd_23H2_gen2
-        dependsOn: []
-        condition: eq('${{ parameters.build23H2gen2 }}', True)
-        timeoutInMinutes: 180
-        steps:
-          - bash: |
-              echo '##vso[task.setvariable variable=VHD_DEBUG]${{parameters.vhddebug}}'
-              echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
-              echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
-              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_D4s_v3'
-              echo '##vso[task.setvariable variable=WINDOWS_SKU]23H2-gen2'
-              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
-              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
-            displayName: Setup Build Variables
-          - template: ./templates/.builder-release-template-windows.yaml
-            parameters:
-              artifactName: 23H2-gen2
-
-  - stage: e2e
-    condition: ne(variables.SKIP_E2E_TESTS, 'true')
-    variables:
-      VHD_BUILD_ID: $(Build.BuildId)
-      LOCATION: $(PACKER_BUILD_LOCATION)
-      TAGS_TO_RUN: "os=windows"
-    jobs:
-      - template: ./templates/e2e-template.yaml
+  - template: ./templates/.build-and-test-windows-vhd-template.yaml
+    parameters:
+      stageName: win_23H2_v2
+      artifactName: 23H2-gen2
+      imageName: windows-23H2-gen2
+      windowsSku: 23H2-gen2
+      hyperVGeneration: V2
+      build: ${{ parameters.build23H2gen2 }}
+      vhddebug: ${{ parameters.vhddebug }}
+      dryrun: ${{ parameters.dryrun }}
 
   - stage: backfill_cleanup_outdated_resources
     dependsOn: []
@@ -192,5 +142,6 @@ stages:
             -e SIG_GALLERY_NAME=${SIG_GALLERY_NAME} \
             -e OS_TYPE="Windows" \
             ${AZURE_CONTAINER_IMAGE} make -f packer.mk backfill-cleanup
+          enabled: false
           displayName: Backfill Clean Up Older Resources
           condition: eq(variables.ENABLE_BACKFILL_CLEANUP, 'True')
diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml
@@ -15,6 +15,7 @@ pr:
     - parts/linux/*
     - packer.mk
     exclude:
+    - vhdbuilder/release-notes
     - vhdbuilder/packer/*.ps1
     - vhdbuilder/packer/**/*.ps1
     - vhdbuilder/packer/*windows*

diff --git a/.pipelines/.vsts-vhd-scanning.yaml b/.pipelines/.vsts-vhd-scanning.yaml
diff --git a/.pipelines/e2e-windows.yaml b/.pipelines/e2e-windows.yaml
@@ -1,6 +1,7 @@
 name: $(Date:yyyyMMdd)$(Rev:.r)
 variables:
   TAGS_TO_RUN: "os=windows"
+  SKIP_E2E_TESTS: false
 trigger:
   branches:
     include:

diff --git a/.pipelines/e2e.yaml b/.pipelines/e2e.yaml
@@ -1,6 +1,7 @@
 name: $(Date:yyyyMMdd)$(Rev:.r)
 variables:
   TAGS_TO_SKIP: "os=windows"
+  SKIP_E2E_TESTS: false
 trigger:
   branches:
     include:

diff --git a/.pipelines/templates/.build-and-test-windows-vhd-template.yaml b/.pipelines/templates/.build-and-test-windows-vhd-template.yaml
@@ -0,0 +1,63 @@
+parameters:
+  - name: stageName
+    type: string
+    displayName: Stage name for the created stages. Must contain only alphanmumeric values and _
+  - name: imageName
+    type: string
+    displayName: The value of the imageName tag to run E2E tests on
+  - name: windowsSku
+    type: string
+    displayName: The windows artifact to build. Might be a duplicate of artifactName
+  - name: artifactName
+    type: string
+    displayName: The artifact to build. Might be a duplicate of windowsSku
+  - name: dryrun
+    displayName: Dry run
+    type: boolean
+    default: False
+  - name: vhddebug
+    displayName: VHD Debug
+    type: boolean
+    default: False
+  - name: build
+    displayName: Boolean flag to actually run these stages.
+    type: boolean
+    default: True
+  - name: buildVmSize
+    type: string
+    default: Standard_D4s_v3
+    displayName: VM SKU to build the VHD with. Has a sensible default
+  - name: hyperVGeneration
+    type: string
+    displayName: V1 or V2.
+
+stages:
+  - stage: build_${{ parameters.stageName }}
+    dependsOn: [ ]
+    jobs:
+      - job: build_${{ parameters.stageName }}
+        dependsOn: []
+        condition: eq('${{ parameters.build }}', True)
+        timeoutInMinutes: 180
+        steps:
+          - bash: |
+              echo '##vso[task.setvariable variable=VHD_DEBUG]${{ parameters.vhddebug }}'
+              echo '##vso[task.setvariable variable=DRY_RUN]${{ parameters.dryrun }}'
+              echo '##vso[task.setvariable variable=HYPERV_GENERATION]${{ parameters.hyperVGeneration }}'
+              echo '##vso[task.setvariable variable=AZURE_VM_SIZE]${{ parameters.buildVmSize }}'
+              echo '##vso[task.setvariable variable=WINDOWS_SKU]${{ parameters.windowsSku }}'
+              echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]$(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)'
+              echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]$(WINDOWS_2022_NANO_IMAGE_URL)'
+              echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]$(WINDOWS_2022_CORE_IMAGE_URL)'
+              echo '##vso[task.setvariable variable=WINDOWS_PRIVATE_PACKAGES_URL]$(PRIVATE_PACKAGES_URL)'
+            displayName: Setup Build Variables
+          - template: ./.builder-release-template-windows.yaml
+            parameters:
+              artifactName: ${{ parameters.artifactName }}
+
+  - stage: e2e_${{ parameters.stageName }}
+    dependsOn: build_${{ parameters.stageName }}
+    variables:
+      TAGS_TO_RUN: imageName=${{ parameters.imageName }}
+    jobs:
+      - template: ./e2e-template.yaml
diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
@@ -168,6 +168,7 @@ steps:
       SUBSCRIPTION_ID: $(SUBSCRIPTION_ID)
       PACKER_VNET_RESOURCE_GROUP_NAME: $(PACKER_VNET_RESOURCE_GROUP_NAME)
       PACKER_VNET_NAME: $(PACKER_VNET_NAME)
+      SKIP_SCANNING: $(SKIP_SCANNING)
       DRY_RUN: $(DRY_RUN)
 
   - task: PublishPipelineArtifact@0

diff --git a/.pipelines/templates/e2e-template.yaml b/.pipelines/templates/e2e-template.yaml
@@ -1,5 +1,6 @@
 jobs:
   - job: e2e
+    condition: and(succeeded(), ne(variables.SKIP_E2E_TESTS, 'true'))
     pool:
       name: $(POOL_NAME)
     timeoutInMinutes: 90

diff --git a/aks-node-controller/go.mod b/aks-node-controller/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

diff --git a/aks-node-controller/go.sum b/aks-node-controller/go.sum
@@ -33,12 +33,12 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/e2e/go.mod b/e2e/go.mod
@@ -76,7 +76,7 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/term v0.27.0 // indirect

diff --git a/e2e/go.sum b/e2e/go.sum
@@ -206,8 +206,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
 golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/e2e/scenario_test.go b/e2e/scenario_test.go
@@ -793,6 +793,7 @@ func runScenarioUbuntu2204GPU(t *testing.T, vmSize string) {
 				// Ensure nvidia-modprobe install does not restart kubelet and temporarily cause node to be unschedulable
 				ValidateNvidiaModProbeInstalled(ctx, s)
 				ValidateKubeletHasNotStopped(ctx, s)
+				ValidateServicesDoNotRestartKubelet(ctx, s)
 			},
 		},
 	})

diff --git a/e2e/validators.go b/e2e/validators.go
@@ -259,6 +259,13 @@ func ValidateKubeletHasNotStopped(ctx context.Context, s *Scenario) {
 	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/"
+	execResult := execOnVMForScenario(ctx, s, command)
+	require.Equal(s.T, "1", execResult.exitCode, "expected to find no services containing 'restart kubelet' in /etc/systemd/system/, but found %q", execResult.stdout.String())
+}
+
 // ValidateKubeletHasFlags checks kubelet is started with the right flags and configs.
 func ValidateKubeletHasFlags(ctx context.Context, s *Scenario, filePath string) {
 	execResult := execOnVMForScenario(ctx, s, `journalctl -u kubelet`)

diff --git a/go.mod b/go.mod
@@ -32,9 +32,9 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect