Merge pull request e2e-win#230 from ionutbalutoiu/update-master-k8s-p…

…rowjobs Update Kubernetes master branch Prowjobs
ionutbalutoiu · Nov 10, 2023 · 9dac6a5 · 9dac6a5
2 parents b3460da + 8ee3cce
commit 9dac6a5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,7 +1,7 @@
 {
     "configurations": [
         {
-            "name": "k8s-e2e-ltsc2019-containerd-flannel-sdnbridge-master",
+            "name": "k8s-e2e-ltsc2022-containerd-flannel-sdnbridge-master",
             "type": "docker",
             "request": "launch",
             "preLaunchTask": "docker-run: debug",
@@ -23,13 +23,13 @@
                     "--build=sdncnibins",
                     "capz_flannel",
                     "--flannel-mode=host-gw",
-                    "--win-os=ltsc2019",
+                    "--win-os=ltsc2022",
                     "--cluster-name=capzctrd"
                 ]
             }
         },
         {
-            "name": "k8s-e2e-ltsc2019-containerd-flannel-sdnoverlay-master",
+            "name": "k8s-e2e-ltsc2022-containerd-flannel-sdnoverlay-master",
             "type": "docker",
             "request": "launch",
             "preLaunchTask": "docker-run: debug",
@@ -51,7 +51,7 @@
                     "--build=sdncnibins",
                     "capz_flannel",
                     "--flannel-mode=overlay",
-                    "--win-os=ltsc2019",
+                    "--win-os=ltsc2022",
                     "--cluster-name=capzctrd"
                 ]
             }

diff --git a/e2e-runner/e2e_runner/ci/capz_flannel/capz_flannel.py b/e2e-runner/e2e_runner/ci/capz_flannel/capz_flannel.py
@@ -704,10 +704,7 @@ def _get_latest_azure_cloud_provider_image_tag(self):
         tags.sort()
         return tags[-1]
 
-    def _azure_cloud_provider_values(self):
-        image_tag = self.kubernetes_version
-        if "k8sbins" in self.bins_built:
-            image_tag = self._get_latest_azure_cloud_provider_image_tag()
+    def _azure_cloud_provider_values(self, image_tag):
         helm_values = {
             "infra": {
                 "clusterName": self.opts.cluster_name,
@@ -726,14 +723,21 @@ def _azure_cloud_provider_values(self):
         return helm_values
 
     def _add_azure_cloud_provider(self):
+        image_tag = self.kubernetes_version
+        if "k8sbins" in self.bins_built:
+            image_tag = self._get_latest_azure_cloud_provider_image_tag()
+        repo = e2e_constants.CLOUD_PROVIDER_AZURE_HELM_REPO.format(image_tag)
         with tempfile.NamedTemporaryFile(suffix=".yaml") as f:
-            f.write(yaml.safe_dump(
-                self._azure_cloud_provider_values()).encode())
+            f.write(
+                yaml.safe_dump(
+                    self._azure_cloud_provider_values(image_tag)
+                ).encode()
+            )
             f.flush()
             e2e_utils.run_shell_cmd(
                 cmd=[
                     "helm", "install",
-                    "--repo", e2e_constants.CLOUD_PROVIDER_AZURE_HELM_REPO,
+                    "--repo", repo,
                     "cloud-provider-azure",
                     "--generate-name", "--values", f.name,
                 ],

diff --git a/e2e-runner/e2e_runner/cli/run_ci.py b/e2e-runner/e2e_runner/cli/run_ci.py
@@ -174,7 +174,7 @@ def add_capz_flannel_subparser(self, subparsers):
             help="The node subnet CIDR block.")
         p.add_argument(
             "--bootstrap-vm-size",
-            default="Standard_D2s_v3",
+            default="Standard_D8s_v3",
             help="Size of the bootstrap VM.")
         p.add_argument(
             "--master-vm-size",
@@ -187,7 +187,7 @@ def add_capz_flannel_subparser(self, subparsers):
             help="Number of K8s Windows agents for the deployment.")
         p.add_argument(
             "--win-os",
-            default="ltsc2019",
+            default="ltsc2022",
             choices=["ltsc2019", "ltsc2022"],
             help="The operating system of the K8s Windows agents.")
         p.add_argument(

diff --git a/e2e-runner/e2e_runner/constants.py b/e2e-runner/e2e_runner/constants.py
@@ -31,5 +31,5 @@
 FLANNEL_MODE_OVERLAY = "overlay"
 FLANNEL_MODE_L2BRIDGE = "host-gw"
 
-CLOUD_PROVIDER_AZURE_HELM_REPO = "https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo"  # noqa: E501
+CLOUD_PROVIDER_AZURE_HELM_REPO = "https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/{}/helm/repo"  # noqa: E501
 CLOUD_PROVIDER_AZURE_TAGS = "https://api.github.com/repos/kubernetes-sigs/cloud-provider-azure/tags"  # noqa: E501
diff --git a/prow/jobs/sig-windows-networking.yaml b/prow/jobs/sig-windows-networking.yaml
@@ -1,9 +1,8 @@
 periodics:
-- name: k8s-e2e-ltsc2019-containerd-flannel-sdnbridge-master
+- name: k8s-e2e-ltsc2022-containerd-flannel-sdnbridge-master
   cron: "0 0 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -21,14 +20,13 @@ periodics:
         - --build=sdncnibins
         - capz_flannel
         - --flannel-mode=host-gw
-        - --win-os=ltsc2019
+        - --win-os=ltsc2022
         - --cluster-name=capzctrd
 
-- name: k8s-e2e-ltsc2019-containerd-flannel-sdnoverlay-master
+- name: k8s-e2e-ltsc2022-containerd-flannel-sdnoverlay-master
   cron: "0 6 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -46,14 +44,13 @@ periodics:
         - --build=sdncnibins
         - capz_flannel
         - --flannel-mode=overlay
-        - --win-os=ltsc2019
+        - --win-os=ltsc2022
         - --cluster-name=capzctrd
 
 - name: k8s-e2e-ltsc2019-containerd-flannel-sdnbridge-stable
   cron: "0 1 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -76,7 +73,6 @@ periodics:
   cron: "0 3 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -99,7 +95,6 @@ periodics:
   cron: "0 5 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -122,7 +117,6 @@ periodics:
   cron: "0 7 */2 * *"
   always_run: true
   labels:
-    preset-flannel-test-regex: "true"
     preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
@@ -145,7 +139,7 @@ periodics:
   cron: "0 4 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"
@@ -168,7 +162,7 @@ periodics:
   cron: "0 10 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"
@@ -191,7 +185,7 @@ periodics:
   cron: "0 9 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"
@@ -214,7 +208,7 @@ periodics:
   cron: "0 15 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"
@@ -237,7 +231,7 @@ periodics:
   cron: "0 2 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"
@@ -260,7 +254,7 @@ periodics:
   cron: "0 8 * * *"
   always_run: true
   labels:
-    preset-aks-test-regex: "true"
+    preset-github-readonly-token: "true"
     preset-ssh-key: "true"
     preset-prod-azure-account: "true"
     preset-windows-private-registry-cred: "true"