From 8be737616d9d11c272be76c4805ee03fd56e90e9 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 29 Dec 2023 00:04:58 -0800 Subject: [PATCH 1/2] ci: ensure kubeproxy is running on windows --- .pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml index 39b91e3bd7..6c2d89e456 100644 --- a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml +++ b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml @@ -34,6 +34,20 @@ jobs: tar -xvzf kubernetes-test-linux-amd64.tar.gz --strip-components=3 kubernetes/test/bin/ginkgo kubernetes/test/bin/e2e.test displayName: "Setup Environment" + - ${{ if contains(parameters.os, 'windows') }}: + - script: | + kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml + kubectl rollout status -n kube-system ds privileged-daemonset + + kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows -owide + pods=`kubectl get pod -n kube-system -l app=privileged-daemonset,os=windows --no-headers | awk '{print $1}'` + for pod in $pods; do + kubectl exec -i -n kube-system $pod -- powershell "Restart-Service kubeproxy" + kubectl exec -i -n kube-system $pod -- powershell "Get-Service kubeproxy" + done + name: kubeproxy + displayName: Restart Kubeproxy on Windows nodes + retryCountOnTaskFailure: 3 - ${{ if eq(parameters.datapath, true) }}: - template: ../k8s-e2e/k8s-e2e-step-template.yaml parameters: From 226e8d31b62e05ccb71d3c6af76a346dbce8071e Mon Sep 17 00:00:00 2001 From: John Payne <89417863+jpayne3506@users.noreply.github.com> Date: Wed, 10 Jan 2024 19:24:29 -0800 Subject: [PATCH 2/2] ci: add set -e Signed-off-by: John Payne <89417863+jpayne3506@users.noreply.github.com> --- .pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml index 6c2d89e456..2ebc576077 100644 --- a/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml +++ b/.pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml @@ -36,6 +36,7 @@ jobs: displayName: "Setup Environment" - ${{ if contains(parameters.os, 'windows') }}: - script: | + set -e kubectl apply -f test/integration/manifests/load/privileged-daemonset-windows.yaml kubectl rollout status -n kube-system ds privileged-daemonset