Merge pull request #35227 from hakman/kops-azure

kOps: Add support for Azure to the generator script

Author: k8s-ci-robot

config/jobs/kubernetes/kops/build_jobs.py

@@ -117,6 +117,13 @@ def build_test(cloud='aws',
         if build_cluster is None:
             build_cluster = 'k8s-infra-prow-build'
 
+    elif cloud == 'azure':
+        kops_image = None
+        kops_ssh_user = 'kops'
+        kops_ssh_key_path = '/etc/ssh-key-secret/ssh-private'
+        if build_cluster is None:
+            build_cluster = 'k8s-infra-prow-build'
+
     validation_wait = None
     if distro in ('flatcar', 'flatcararm64') or (distro in ('amzn2', 'rhel8') and kops_version in ('1.26', '1.27')):
         validation_wait = '20m'
@@ -305,6 +312,13 @@ def presubmit_test(branch='master',
         if build_cluster is None:
             build_cluster = 'k8s-infra-kops-prow-build'
 
+    elif cloud == 'azure':
+        kops_image = None
+        kops_ssh_user = 'kops'
+        kops_ssh_key_path = '/etc/ssh-key-secret/ssh-private'
+        if build_cluster is None:
+            build_cluster = 'k8s-infra-prow-build'
+
     elif cloud == 'gce':
         kops_image = None
         kops_ssh_user = 'prow'
@@ -1433,6 +1447,8 @@ def generate_presubmits_distros():
 def generate_network_plugins():
 
     plugins = ['amazon-vpc', 'calico', 'cilium', 'cilium-etcd', 'cilium-eni', 'flannel', 'kindnet', 'kopeio', 'kuberouter']
+    supports_gce = {'calico', 'cilium', 'kindnet'}
+    supports_azure = {'cilium'}
     results = []
     for plugin in plugins:
         networking_arg = plugin.replace('amazon-vpc', 'amazonvpc').replace('kuberouter', 'kube-router')
@@ -1461,6 +1477,35 @@ def generate_network_plugins():
                 runs_per_day=3,
             )
         )
+        if plugin in supports_azure:
+            results.append(
+                build_test(
+                    cloud="azure",
+                    # distro="ubuntu2404",
+                    k8s_version=k8s_version,
+                    kops_channel='alpha',
+                    feature_flags=['Azure'],
+                    name_override=f"kops-azure-cni-{plugin}",
+                    networking=networking_arg,
+                    extra_dashboards=['kops-network-plugins'],
+                    runs_per_day=8
+                )
+            )
+        if plugin in supports_gce:
+            results.append(
+                build_test(
+                    cloud="gce",
+                    # distro="ubuntu2404",
+                    k8s_version=k8s_version,
+                    kops_channel='alpha',
+                    name_override=f"kops-gce-cni-{plugin}",
+                    networking=networking_arg,
+                    extra_flags=["--gce-service-account=default"],
+                    extra_dashboards=['kops-network-plugins'],
+                    runs_per_day=8,
+                )
+            )
+
     return results
 
 ################################
@@ -1824,6 +1869,7 @@ def generate_presubmits_network_plugins():
     }
     supports_ipv6 = {'amazonvpc', 'calico', 'cilium', 'kindnet'}
     supports_gce = {'calico', 'cilium', 'kindnet'}
+    supports_azure = {'cilium'}
     results = []
     for plugin, run_if_changed in plugins.items():
         k8s_version = 'stable'
@@ -1859,13 +1905,30 @@ def generate_presubmits_network_plugins():
                 optional=optional,
             )
         )
+        if plugin in supports_azure:
+            results.append(
+                presubmit_test(
+                    cloud='azure',
+                    # distro='ubuntu2404',
+                    feature_flags=['Azure'],
+                    k8s_version=k8s_version,
+                    kops_channel='alpha',
+                    name=f"pull-kops-e2e-azure-cni-{plugin}",
+                    tab_name=f"e2e-azure-cni-{plugin}",
+                    networking=networking_arg,
+                    run_if_changed=run_if_changed,
+                    optional=True,
+                )
+            )
         if plugin in supports_gce:
             results.append(
                 presubmit_test(
                     cloud='gce',
+                    # distro='ubuntu2404',
                     k8s_version=k8s_version,
                     kops_channel='alpha',
                     name=f"pull-kops-e2e-gce-cni-{plugin}",
+                    tab_name=f"e2e-gce-cni-{plugin}",
                     networking=networking_arg,
                     extra_flags=[
                         f"--gce-service-account=default" # Workaround for test-infra#24747

config/jobs/kubernetes/kops/kops-periodics-network-plugins.yaml

@@ -1,5 +1,5 @@
 # Test jobs generated by build_jobs.py (do not manually edit)
-# 9 jobs, total of 189 runs per week
+# 13 jobs, total of 413 runs per week
 periodics:
 
 # {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large --set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true --set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80 --set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10 --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "amazonvpc"}
@@ -130,6 +130,70 @@ periodics:
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-cni-calico
 
+# {"cloud": "gce", "distro": "u2404", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
+- name: e2e-kops-gce-cni-calico
+  cron: '26 1-23/3 * * *'
+  labels:
+    preset-k8s-ssh: "true"
+  cluster: k8s-infra-prow-build
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    serviceAccountName: k8s-kops-test
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=gce \
+          --admin-access=0.0.0.0/0 \
+          --create-args="--channel=alpha --networking=calico --gce-service-account=default" \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+          --test=kops \
+          -- \
+          --test-args="-test.timeout=60m" \
+          --test-package-marker=stable.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/ssh-key-secret/ssh-private
+      - name: KUBE_SSH_USER
+        value: prow
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250717-57d1ca3de9-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          cpu: "4"
+          memory: 6Gi
+        requests:
+          cpu: "4"
+          memory: 6Gi
+  annotations:
+    test.kops.k8s.io/cloud: gce
+    test.kops.k8s.io/distro: u2404
+    test.kops.k8s.io/extra_flags: --gce-service-account=default
+    test.kops.k8s.io/k8s_version: stable
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: latest
+    test.kops.k8s.io/networking: calico
+    testgrid-dashboards: kops-distro-u2404, kops-gce, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '35'
+    testgrid-tab-name: kops-gce-cni-calico
+
 # {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
 - name: e2e-kops-aws-cni-cilium
   cron: '58 5-23/8 * * *'
@@ -194,6 +258,131 @@ periodics:
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-cni-cilium
 
+# {"cloud": "azure", "distro": "u2404", "feature_flags": "Azure", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
+- name: e2e-kops-azure-cni-cilium
+  cron: '53 0-23/3 * * *'
+  labels:
+    preset-service-account: "true"
+    preset-kops-azure-cred-wi: "true"
+  cluster: k8s-infra-prow-build
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    serviceAccountName: azure
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=azure \
+          --create-args="--channel=alpha --networking=cilium" \
+          --env=KOPS_FEATURE_FLAGS=Azure \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+          --test=kops \
+          -- \
+          --test-args="-test.timeout=60m" \
+          --test-package-marker=stable.txt \
+          --parallel=25
+      env:
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250717-57d1ca3de9-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          cpu: "4"
+          memory: 6Gi
+        requests:
+          cpu: "4"
+          memory: 6Gi
+  annotations:
+    test.kops.k8s.io/cloud: azure
+    test.kops.k8s.io/distro: u2404
+    test.kops.k8s.io/feature_flags: Azure
+    test.kops.k8s.io/k8s_version: stable
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: latest
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: kops-distro-u2404, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '35'
+    testgrid-tab-name: kops-azure-cni-cilium
+
+# {"cloud": "gce", "distro": "u2404", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium"}
+- name: e2e-kops-gce-cni-cilium
+  cron: '16 1-23/3 * * *'
+  labels:
+    preset-k8s-ssh: "true"
+  cluster: k8s-infra-prow-build
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    serviceAccountName: k8s-kops-test
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=gce \
+          --admin-access=0.0.0.0/0 \
+          --create-args="--channel=alpha --networking=cilium --gce-service-account=default" \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+          --test=kops \
+          -- \
+          --test-args="-test.timeout=60m" \
+          --test-package-marker=stable.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/ssh-key-secret/ssh-private
+      - name: KUBE_SSH_USER
+        value: prow
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250717-57d1ca3de9-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          cpu: "4"
+          memory: 6Gi
+        requests:
+          cpu: "4"
+          memory: 6Gi
+  annotations:
+    test.kops.k8s.io/cloud: gce
+    test.kops.k8s.io/distro: u2404
+    test.kops.k8s.io/extra_flags: --gce-service-account=default
+    test.kops.k8s.io/k8s_version: stable
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: latest
+    test.kops.k8s.io/networking: cilium
+    testgrid-dashboards: kops-distro-u2404, kops-gce, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '35'
+    testgrid-tab-name: kops-gce-cni-cilium
+
 # {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "cilium-etcd"}
 - name: e2e-kops-aws-cni-cilium-etcd
   cron: '54 3-23/8 * * *'
@@ -450,6 +639,70 @@ periodics:
     testgrid-days-of-results: '90'
     testgrid-tab-name: kops-aws-cni-kindnet
 
+# {"cloud": "gce", "distro": "u2404", "extra_flags": "--gce-service-account=default", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kindnet"}
+- name: e2e-kops-gce-cni-kindnet
+  cron: '39 2-23/3 * * *'
+  labels:
+    preset-k8s-ssh: "true"
+  cluster: k8s-infra-prow-build
+  decorate: true
+  decoration_config:
+    timeout: 90m
+  extra_refs:
+  - org: kubernetes
+    repo: kops
+    base_ref: master
+    workdir: true
+    path_alias: k8s.io/kops
+  spec:
+    serviceAccountName: k8s-kops-test
+    containers:
+    - command:
+      - runner.sh
+      args:
+      - bash
+      - -c
+      - |
+        make test-e2e-install
+        kubetest2 kops \
+          -v 2 \
+          --up --down \
+          --cloud-provider=gce \
+          --admin-access=0.0.0.0/0 \
+          --create-args="--channel=alpha --networking=kindnet --gce-service-account=default" \
+          --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
+          --kubernetes-version=https://dl.k8s.io/release/stable.txt \
+          --test=kops \
+          -- \
+          --test-args="-test.timeout=60m" \
+          --test-package-marker=stable.txt \
+          --parallel=25
+      env:
+      - name: KUBE_SSH_KEY_PATH
+        value: /etc/ssh-key-secret/ssh-private
+      - name: KUBE_SSH_USER
+        value: prow
+      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250717-57d1ca3de9-master
+      imagePullPolicy: Always
+      resources:
+        limits:
+          cpu: "4"
+          memory: 6Gi
+        requests:
+          cpu: "4"
+          memory: 6Gi
+  annotations:
+    test.kops.k8s.io/cloud: gce
+    test.kops.k8s.io/distro: u2404
+    test.kops.k8s.io/extra_flags: --gce-service-account=default
+    test.kops.k8s.io/k8s_version: stable
+    test.kops.k8s.io/kops_channel: alpha
+    test.kops.k8s.io/kops_version: latest
+    test.kops.k8s.io/networking: kindnet
+    testgrid-dashboards: kops-distro-u2404, kops-gce, kops-k8s-stable, kops-latest, kops-network-plugins, sig-cluster-lifecycle-kops
+    testgrid-days-of-results: '35'
+    testgrid-tab-name: kops-gce-cni-kindnet
+
 # {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "kopeio"}
 - name: e2e-kops-aws-cni-kopeio
   cron: '13 2-23/8 * * *'