Merge pull request #2335 from marosset/cluster-template-prow-custom-c…

…ontainerd decoupling using K8s ci binaries and different versions of containerd for ci windows templates
kubernetes-sigs · Jun 8, 2022 · efc37fd · efc37fd
2 parents b6f33a6 + 22ba1c9
commit efc37fd
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 105 deletions.
diff --git a/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml b/templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
diff --git a/templates/test/ci/patches/kubeadm-bootstrap-windows-containerd.yaml b/templates/test/ci/patches/kubeadm-bootstrap-windows-containerd.yaml
@@ -0,0 +1,26 @@
+- op: add
+  path: /spec/template/spec/files/-
+  value:
+    content: |
+      $ErrorActionPreference = 'Stop'
+
+      $$CONTAINERD_URL="${WINDOWS_CONTAINERD_URL}"
+      if($$CONTAINERD_URL -ne ""){
+        # Kubelet service depends on contianerd service so make a best effort attempt to stop it
+        Stop-Service kubelet -Force -ErrorAction SilentlyContinue
+        Stop-Service containerd -Force
+        echo "downloading containerd: $$CONTAINERD_URL"
+        curl.exe --retry 10 --retry-delay 5 -L "$$CONTAINERD_URL" --output "c:/k/containerd.tar.gz"
+        tar.exe -zxvf c:/k/containerd.tar.gz -C "c:/Program Files/containerd" --strip-components 1
+
+        Start-Service containerd
+      }
+
+      containerd.exe --version
+      containerd-shim-runhcs-v1.exe --version
+    path: C:/replace-containerd.ps1
+    permissions: "0744"
+- op: add
+  path: /spec/template/spec/preKubeadmCommands/-
+  value:
+    powershell C:/replace-containerd.ps1
diff --git a/templates/test/ci/prow-ci-version/kustomization.yaml b/templates/test/ci/prow-ci-version/kustomization.yaml
@@ -27,7 +27,7 @@ patches:
     kind: KubeadmConfigTemplate
     name: .*-md-win
     namespace: default
-  path: patches/kubeadm-bootstrap-windows.yaml
+  path: patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
 - target:
     group: controlplane.cluster.x-k8s.io
     version: v1beta1

diff --git a/...on/patches/kubeadm-bootstrap-windows.yaml → ...dm-bootstrap-windows-k8s-ci-binaries.yaml b/...on/patches/kubeadm-bootstrap-windows.yaml → ...dm-bootstrap-windows-k8s-ci-binaries.yaml
@@ -18,16 +18,6 @@
         }
       }
 
-      $$CONTAINERD_URL="${WINDOWS_CONTAINERD_URL}"
-      if($$CONTAINERD_URL -ne ""){
-        Stop-Service containerd -Force
-        echo "downloading containerd: $$CONTAINERD_URL"
-        curl.exe --retry 10 --retry-delay 5 -L "$$CONTAINERD_URL" --output "c:/k/containerd.tar.gz"
-        tar.exe -zxvf c:/k/containerd.tar.gz -C "c:/Program Files/containerd" --strip-components 1
-
-        Start-Service containerd
-      }
-
       # Tag it to the ci version.  The image knows how to use the copy locally with the configmap
       # that is applied at at this stage (windows-kubeproxy-ci.yaml)
       ctr.exe -n k8s.io images pull docker.io/sigwindowstools/kube-proxy:v1.23.1-calico-hostprocess
@@ -37,8 +27,6 @@
       kubectl.exe version --client=true --short=true
       kubelet.exe --version
       kube-proxy.exe --version
-      containerd.exe --version
-      containerd-shim-runhcs-v1.exe --version
     path: C:/replace-ci-binaries.ps1
     permissions: "0744"
 - op: add

diff --git a/templates/test/ci/prow-machine-pool-ci-version/kustomization.yaml b/templates/test/ci/prow-machine-pool-ci-version/kustomization.yaml
@@ -23,7 +23,7 @@ patches:
     kind: KubeadmConfig
     name: .*-mp-win
     namespace: default
-  path: patches/kubeadm-bootstrap-windows.yaml
+  path: patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico
     behavior: merge

diff --git a/...on/patches/kubeadm-bootstrap-windows.yaml → ...dm-bootstrap-windows-k8s-ci-binaries.yaml b/...on/patches/kubeadm-bootstrap-windows.yaml → ...dm-bootstrap-windows-k8s-ci-binaries.yaml
@@ -2,6 +2,8 @@
   path: /spec/files/-
   value:
     content: |
+      $ErrorActionPreference = 'Stop'
+
       Stop-Service kubelet -Force
 
       $$CI_VERSION="${CI_VERSION}"

diff --git a/templates/test/ci/prow/kustomization.yaml b/templates/test/ci/prow/kustomization.yaml
@@ -32,6 +32,13 @@ patches:
     name: .*-md-win
     namespace: default
   path: ../patches/windows-tmp-folder.yaml
+- target:
+    group: bootstrap.cluster.x-k8s.io
+    version: v1beta1
+    kind: KubeadmConfigTemplate
+    name: .*-md-win
+    namespace: default
+  path: ../patches/kubeadm-bootstrap-windows-containerd.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico
     files:

diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
diff --git a/templates/test/dev/custom-builds/kustomization.yaml b/templates/test/dev/custom-builds/kustomization.yaml
@@ -29,7 +29,7 @@ patches:
     kind: KubeadmConfigTemplate
     name: .*-md-win
     namespace: default
-  path: patches/kubeadm-bootstrap-windows.yaml
+  path: ../../ci/prow-ci-version/patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico
     behavior: merge