Merge pull request #8412 from upodroid/prow-s390x

add the s390x cluster to prow

Author: k8s-ci-robot

kubernetes/gke-prow/prow/crier.yaml

@@ -48,7 +48,7 @@ spec:
           env:
             # Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
             - name: KUBECONFIG
-              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig"
+              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig:/etc/k8s-infra-s390x-prow-build-kubeconfig/kubeconfig"
             # AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
             - name: AWS_ROLE_ARN
               value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -90,6 +90,9 @@ spec:
             - mountPath: /etc/k8s-infra-ppc64le-prow-build-kubeconfig
               name: kubeconfig-k8s-infra-ppc64le-prow-build
               readOnly: true
+            - mountPath: /etc/k8s-infra-s390x-prow-build-kubeconfig
+              name: kubeconfig-k8s-infra-s390x-prow-build
+              readOnly: true
             - name: config
               mountPath: /etc/config
               readOnly: true
@@ -151,6 +154,10 @@ spec:
           secret:
             defaultMode: 420
             secretName: kubeconfig-k8s-infra-ppc64le-prow-build
+        - name: kubeconfig-k8s-infra-s390x-prow-build
+          secret:
+            defaultMode: 420
+            secretName: kubeconfig-k8s-infra-s390x-prow-build
         # AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
         - name: aws-iam-token
           projected:

kubernetes/gke-prow/prow/deck.yaml

@@ -63,7 +63,7 @@ spec:
           env:
             # Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
             - name: KUBECONFIG
-              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig"
+              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig:/etc/k8s-infra-s390x-prow-build-kubeconfig/kubeconfig"
             # AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
             - name: AWS_ROLE_ARN
               value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -108,6 +108,9 @@ spec:
             - mountPath: /etc/k8s-infra-ppc64le-prow-build-kubeconfig
               name: kubeconfig-k8s-infra-ppc64le-prow-build
               readOnly: true
+            - mountPath: /etc/k8s-infra-s390x-prow-build-kubeconfig
+              name: kubeconfig-k8s-infra-s390x-prow-build
+              readOnly: true
             - name: config
               mountPath: /etc/config
               readOnly: true
@@ -179,6 +182,10 @@ spec:
           secret:
             defaultMode: 420
             secretName: kubeconfig-k8s-infra-ppc64le-prow-build
+        - name: kubeconfig-k8s-infra-s390x-prow-build
+          secret:
+            defaultMode: 420
+            secretName: kubeconfig-k8s-infra-s390x-prow-build
         - name: config
           configMap:
             name: config

kubernetes/gke-prow/prow/external-secrets.yaml

@@ -193,3 +193,16 @@ spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: k8s-infra-prow
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: kubeconfig-k8s-infra-s390x-prow-build
+spec:
+  data:
+    - remoteRef:
+        key: k8s-infra-s390x-prow-build-kubeconfig
+      secretKey: kubeconfig
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: k8s-infra-prow

kubernetes/gke-prow/prow/gce-ssd-retain_storageclass.yaml

@@ -51,7 +51,7 @@ spec:
           env:
             # Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
             - name: KUBECONFIG
-              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig"
+              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig:/etc/k8s-infra-s390x-prow-build-kubeconfig/kubeconfig"
             # AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
             - name: AWS_ROLE_ARN
               value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -118,6 +118,9 @@ spec:
             - mountPath: /etc/k8s-infra-ppc64le-prow-build-kubeconfig
               name: kubeconfig-k8s-infra-ppc64le-prow-build
               readOnly: true
+            - mountPath: /etc/k8s-infra-s390x-prow-build-kubeconfig
+              name: kubeconfig-k8s-infra-s390x-prow-build
+              readOnly: true
             # AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
             - mountPath: /var/run/secrets/aws-iam-token/serviceaccount
               name: aws-iam-token
@@ -192,6 +195,10 @@ spec:
           secret:
             defaultMode: 420
             secretName: kubeconfig-k8s-infra-ppc64le-prow-build
+        - name: kubeconfig-k8s-infra-s390x-prow-build
+          secret:
+            defaultMode: 420
+            secretName: kubeconfig-k8s-infra-s390x-prow-build
         # AWS IAM token needed to assume role to access the prow-build-cluster EKS cluster.
         - name: aws-iam-token
           projected:

kubernetes/gke-prow/prow/hook.yaml

@@ -3,22 +3,20 @@ kind: Kustomization
 namespace: default
 
 resources:
-- cherrypicker.yaml
-- crier.yaml
-- deck.yaml
-- external-secrets.yaml
-- gce-ssd-retain_storageclass.yaml
-- ghproxy.yaml
-- hook.yaml
-- horologium.yaml
-- hyperdisk-sc.yaml
-- gateway.yaml
-- needs-rebase.yaml
-- pipeline.yaml
-- prow-controller-manager.yaml
-- pushgateway.yaml
-- sinker.yaml
-- statusreconciler.yaml
-- tide.yaml
-- monitoring.yaml
-- trusted_serviceaccounts.yaml
+  - cherrypicker.yaml
+  - crier.yaml
+  - deck.yaml
+  - external-secrets.yaml
+  - ghproxy.yaml
+  - hook.yaml
+  - horologium.yaml
+  - hyperdisk-sc.yaml
+  - gateway.yaml
+  - needs-rebase.yaml
+  - pipeline.yaml
+  - prow-controller-manager.yaml
+  - pushgateway.yaml
+  - sinker.yaml
+  - statusreconciler.yaml
+  - tide.yaml
+  - monitoring.yaml

kubernetes/gke-prow/prow/kustomization.yaml

@@ -46,7 +46,7 @@ spec:
           env:
             # Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
             - name: KUBECONFIG
-              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig"
+              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig:/etc/k8s-infra-s390x-prow-build-kubeconfig/kubeconfig"
             # AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
             - name: AWS_ROLE_ARN
               value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -88,6 +88,9 @@ spec:
             - mountPath: /etc/k8s-infra-ppc64le-prow-build-kubeconfig
               name: kubeconfig-k8s-infra-ppc64le-prow-build
               readOnly: true
+            - mountPath: /etc/k8s-infra-s390x-prow-build-kubeconfig
+              name: kubeconfig-k8s-infra-s390x-prow-build
+              readOnly: true
             - name: config
               mountPath: /etc/config
               readOnly: true
@@ -143,6 +146,10 @@ spec:
           secret:
             defaultMode: 420
             secretName: kubeconfig-k8s-infra-ppc64le-prow-build
+        - name: kubeconfig-k8s-infra-s390x-prow-build
+          secret:
+            defaultMode: 420
+            secretName: kubeconfig-k8s-infra-s390x-prow-build
         - name: config
           configMap:
             name: config

kubernetes/gke-prow/prow/prow-controller-manager.yaml

@@ -26,7 +26,7 @@ spec:
           env:
             # Use KUBECONFIG envvar rather than --kubeconfig flag in order to provide multiple configs to merge.
             - name: KUBECONFIG
-              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig"
+              value: "/etc/kubeconfig-k8s-infra-prow/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build/kubeconfig:/etc/kubeconfig-k8s-infra-prow-build-trusted/kubeconfig:/etc/kubeconfig-k8s-infra-aks-prow-build/kubeconfig:/etc/kubeconfig-eks-prow-build-cluster/kubeconfig:/etc/kubeconfig-k8s-infra-kops-prow-build/kubeconfig:/etc/k8s-infra-ppc64le-prow-build-kubeconfig/kubeconfig:/etc/k8s-infra-s390x-prow-build-kubeconfig/kubeconfig"
             # AWS_ variables needed to assume role to access the prow-build-cluster EKS cluster.
             - name: AWS_ROLE_ARN
               value: arn:aws:iam::468814281478:role/Prow-EKS-Admin
@@ -68,6 +68,9 @@ spec:
             - mountPath: /etc/k8s-infra-ppc64le-prow-build-kubeconfig
               name: kubeconfig-k8s-infra-ppc64le-prow-build
               readOnly: true
+            - mountPath: /etc/k8s-infra-s390x-prow-build-kubeconfig
+              name: kubeconfig-k8s-infra-s390x-prow-build
+              readOnly: true
             - name: config
               mountPath: /etc/config
               readOnly: true
@@ -111,6 +114,10 @@ spec:
           secret:
             defaultMode: 420
             secretName: kubeconfig-k8s-infra-ppc64le-prow-build
+        - name: kubeconfig-k8s-infra-s390x-prow-build
+          secret:
+            defaultMode: 420
+            secretName: kubeconfig-k8s-infra-s390x-prow-build
         - name: config
           configMap:
             name: config

kubernetes/gke-prow/prow/sinker.yaml

@@ -84,6 +84,7 @@ spec:
         config: "{{ .config }}"
       metadata:
         labels:
+          argocd.argoproj.io/secret-type: cluster
           clusterType: prow
           environment: prod
           prowNamespace: test-pods
@@ -105,11 +106,12 @@ spec:
     template:
       engineVersion: v2
       data:
-        name: ibm-s90x
+        name: ibm-s390x
         server: https://d7b2a019-eu-de.lb.appdomain.cloud:6443
         config: "{{ .config }}"
       metadata:
         labels:
+          argocd.argoproj.io/secret-type: cluster
           clusterType: prow
           environment: prod
           prowNamespace: test-pods