Merge pull request #7933 from Amulyam24/ibm-janitor

Configure boskos resources for ibm-ppc64le cluster

Author: k8s-ci-robot

kubernetes/ibm-ppc64le/prow/boskos-janitor.yaml

@@ -1,27 +1,34 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: boskos-janitor
+  name: boskos-ibmcloud-janitor
   labels:
-    app: boskos-janitor
+    app: boskos-ibmcloud-janitor
 spec:
-  replicas: 1 # 2 distributed janitor instances
+  replicas: 2 # 2 distributed janitor instances
   selector:
     matchLabels:
-      app: boskos-janitor
+      app: boskos-ibmcloud-janitor
   template:
     metadata:
       labels:
-        app: boskos-janitor
+        app: boskos-ibmcloud-janitor
     spec:
       terminationGracePeriodSeconds: 300
-      serviceAccountName: boskos-janitor
       containers:
-        - name: boskos-janitor
-          image: gcr.io/k8s-staging-boskos/janitor:v20250316-840dd60
+        - name: boskos-ibmcloud-janitor
+          image: gcr.io/k8s-staging-boskos/ibmcloud-janitor-boskos:v20250316-840dd60
           args:
             - --boskos-url=http://boskos.test-pods.svc.cluster.local.
-            - --resource-type=bar
-            - --pool-size=20
-            - --
-            - --hours=0
+            - --resource-type=powervs
+            - --ignore-api-key=true
+          env:
+          - name: IBMCLOUD_ENV_FILE # TODO: explore on how to read key from the file instead of env var
+            value: "/home/.ibmcloud/api-key"
+          volumeMounts:
+            - name: credentials
+              mountPath: /home/.ibmcloud
+      volumes:
+        - name: credentials
+          secret:
+            secretName: boskos-janitor-api-key

kubernetes/ibm-ppc64le/prow/boskos-reaper.yaml

@@ -20,4 +20,4 @@ spec:
           image: gcr.io/k8s-staging-boskos/reaper:v20250316-840dd60
           args:
             - --boskos-url=http://boskos.test-pods.svc.cluster.local.
-            - --resource-type=bar
+            - --resource-type=powervs

kubernetes/ibm-ppc64le/prow/boskos-resources-configmap.yaml

@@ -3,9 +3,14 @@ data:
   config: |
     resources:
     - names:
-      - foo
+      - k8s-boskos-powervs-lon04
+      - k8s-boskos-powervs-lon06
+      - k8s-boskos-powervs-sao01
+      - k8s-boskos-powervs-syd04
+      - k8s-boskos-powervs-syd05
+      - k8s-boskos-powervs-tok04
       state: dirty
-      type: bar
+      type: powervs
 kind: ConfigMap
 metadata:
   name: resources

kubernetes/ibm-ppc64le/prow/secrets.yaml

@@ -54,3 +54,21 @@ spec:
     - secretKey: ssh-privatekey
       remoteRef:
         key: 72d8039f-6cfc-1bbf-ba8e-d85985b42ee0
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: boskos-janitor-api-key
+  namespace: test-pods
+spec:
+  refreshInterval: 60m
+  secretStoreRef:
+    name: secretstore-ibm-k8s
+    kind: ClusterSecretStore
+  target:
+    name: boskos-janitor-api-key
+    creationPolicy: Owner
+  data:
+    - secretKey: api-key
+      remoteRef:
+        key: iam_credentials/6db52764-fc6a-726f-b7b5-8f2e703793be