Adding preset to use Azure resources, moving 2022 master job to azure

Signed-off-by: ritikaguptams <ritikagupta@microsoft.com>
kubernetes · Jul 17, 2024 · a0b969f · a0b969f
1 parent 0695b19
commit a0b969f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/...g/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presets.yaml b/...g/jobs/kubernetes-sigs/cluster-api-provider-azure/cluster-api-provider-azure-presets.yaml
@@ -38,3 +38,31 @@ presets:
   - mountPath: /var/run/secrets/azure-token/serviceaccount
     name: azure-token
     readOnly: true
+- labels:
+    preset-azure-community: "true"
+  env: # below env values are not secrets
+  - name: AZURE_CLIENT_IDs
+    value: "34d8e06d-d198-477e-b166-6936e58d90ae"
+  - name: AZURE_SUBSCRIPTION_ID
+    value: "46678f10-4bbb-447e-98e8-d2829589f2d8"
+  - name: AZURE_TENANT_ID
+    value: "d1aa7522-0959-442e-80ee-8c4f7fb4c184"
+  - name: AZURE_FEDERATED_TOKEN_FILE
+    value: "/var/run/secrets/azure-token/serviceaccount/token"
+  - name: AZURE_STORAGE_ACCOUNT
+    value: "k8sprowstoragecomm"
+  - name: REGISTRY
+    value: "capzcicommunity.azurecr.io"
+  volumes:
+  - name: azure-token
+    projected:
+      defaultMode: 420
+      sources:
+      - serviceAccountToken:
+          expirationSeconds: 86400
+          path: token
+          audience: api://AzureADTokenExchange
+  volumeMounts:
+  - mountPath: /var/run/secrets/azure-token/serviceaccount
+    name: azure-token
+    readOnly: true
diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-master-windows-presubmits.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-master-windows-presubmits.yaml
@@ -424,6 +424,7 @@ presubmits:
       preset-capz-windows-common: "true"
       preset-capz-containerd-1-7-latest: "true"
       preset-capz-windows-2022: "true"
+      preset-azure-community: "true"
     extra_refs:
     - org: kubernetes-sigs
       repo: cluster-api-provider-azure
@@ -455,19 +456,6 @@ presubmits:
           env:
           - name: GINKGO_FOCUS
             value: \[sig-windows\] # run just a subset to speed up testing time
-          volumeMounts:
-          - mountPath: /var/run/secrets/azure-token/serviceaccount
-            name: azure-token
-            readOnly: true
-      volumes:
-        - name: azure-token
-          projected:
-            defaultMode: 420
-            sources:
-              - serviceAccountToken:
-                  expirationSeconds: 86400
-                  path: token
-                  audience: api://AzureADTokenExchange
     annotations:
       testgrid-dashboards: sig-windows-presubmit
       testgrid-tab-name: pull-e2e-capz-windows-extension-community
@@ -485,7 +473,6 @@ presubmits:
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
       preset-azure-cred-wi: "true"
-      preset-azure-anonymous-pull: "true" # Sets REGISTRY which is needed when building CCM/CNM images
       preset-windows-private-registry-cred: "true"
       preset-capz-windows-common: "true"
       preset-capz-containerd-1-7-latest: "true"

diff --git a/config/jobs/kubernetes-sigs/sig-windows/release-master-windows.yaml b/config/jobs/kubernetes-sigs/sig-windows/release-master-windows.yaml
@@ -230,15 +230,15 @@ periodics:
     testgrid-dashboards: sig-windows-master-release, sig-windows-signal
     testgrid-tab-name: capz-windows-containerd-master-serial-slow-hpa
 - name: ci-kubernetes-e2e-capz-master-windows-2022
+  cluster: k8s-infra-prow-build
   interval: 3h
   decorate: true
   decoration_config:
     timeout: 4h
   labels:
     preset-dind-enabled: "true"
     preset-kind-volume-mounts: "true"
-    preset-azure-cred-wi: "true"
-    preset-azure-anonymous-pull: "true" # Sets REGISTRY which is needed when building CCM/CNM images
+    preset-azure-community: "true"
     preset-capz-windows-common: "true"
     preset-capz-containerd-1-7-latest: "true"
     preset-windows-private-registry-cred: "true"
@@ -259,7 +259,6 @@ periodics:
     path_alias: sigs.k8s.io/cloud-provider-azure
     workdir: false
   spec:
-    serviceAccountName: prowjob-default-sa
     containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240705-131cd74733-master
         command:
@@ -273,6 +272,9 @@ periodics:
           requests:
             cpu: 2
             memory: "9Gi"
+          limits:
+            cpu: 2
+            memory: "9Gi"
   annotations:
     testgrid-alert-email: kubernetes-provider-azure@googlegroups.com, sig-windows-leads@kubernetes.io
     testgrid-dashboards: sig-windows-master-release