From 8d7c2da392904e9ebd4ac5273370254bd4eb091b Mon Sep 17 00:00:00 2001
From: peppi-lotta <peppi-lotta.saari@est.tech>
Date: Tue, 6 Feb 2024 13:40:09 +0000
Subject: [PATCH] Final fixes

Signed-off-by: peppi-lotta <peppi-lotta.saari@est.tech>
---
 prow/manifests/overlays/metal3/config.yaml    | 14 ++----
 .../generic-autobumper-config.yaml            |  0
 .../overlays/metal3/kustomization.yaml        | 49 -------------------
 3 files changed, 3 insertions(+), 60 deletions(-)
 rename prow/manifests/overlays/metal3/{external-plugins => }/generic-autobumper-config.yaml (100%)

diff --git a/prow/manifests/overlays/metal3/config.yaml b/prow/manifests/overlays/metal3/config.yaml
index daf9d9070..a90c97f28 100644
--- a/prow/manifests/overlays/metal3/config.yaml
+++ b/prow/manifests/overlays/metal3/config.yaml
@@ -302,8 +302,7 @@ periodics:
           secret:
             secretName: github-token
   - name: autobump-prow-images
-    interval: 24h
-    cluster: prow
+    cron: 0 0 * * 0
     decorate: true
     extra_refs:
     - org: metal3-io
@@ -315,23 +314,16 @@ periodics:
         command:
         - generic-autobumper
         args:
-        - --config=/etc/config/config.yaml
-        - --labels-override=skip-review
-        - --skip-if-no-oncall
+        - --config="prow/manifests/overlays/metal3/generic-autobumper-config.yaml"
+        - --signoff=true
         volumeMounts:
         - name: github-token
           mountPath: /etc/github
           readOnly: true
-        - name: config
-          mountPath: /etc/config
-          readOnly: true
       volumes:
       - name: github-token
         secret:
           secretName: github-token
-      - name: config
-        configMap:
-          name: generic-autobumper-config
 
 presubmits:
   Nordix/metal3-clusterapi-docs:
diff --git a/prow/manifests/overlays/metal3/external-plugins/generic-autobumper-config.yaml b/prow/manifests/overlays/metal3/generic-autobumper-config.yaml
similarity index 100%
rename from prow/manifests/overlays/metal3/external-plugins/generic-autobumper-config.yaml
rename to prow/manifests/overlays/metal3/generic-autobumper-config.yaml
diff --git a/prow/manifests/overlays/metal3/kustomization.yaml b/prow/manifests/overlays/metal3/kustomization.yaml
index 48fb6407f..217c2af6a 100644
--- a/prow/manifests/overlays/metal3/kustomization.yaml
+++ b/prow/manifests/overlays/metal3/kustomization.yaml
@@ -11,7 +11,6 @@ resources:
 - external-plugins/needs-rebase_service.yaml
 - external-plugins/labels_cronjob.yaml
 - external-plugins/jenkins-operator.yaml
-- external-plugins/generic-autobumper-deployment.yaml
 - pdb.yaml
 - limitrange.yaml
 
@@ -38,10 +37,6 @@ configMapGenerator:
   - labels.yaml
   name: label-config
   namespace: prow
-- files:
-  - config.yaml=external-plugins/generic-autobumper-config.yaml
-  name: generic-autobumper-config
-  namespace: prow
 
 secretGenerator:
 - files:
@@ -79,47 +74,3 @@ secretGenerator:
   name: jenkins-token
   namespace: prow
   type: Opaque
-
-images:
-- name: gcr.io/k8s-prow/crier
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/deck
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/ghproxy
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/hook
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/horologium
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/prow-controller-manager
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/sinker
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/status-reconciler
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/tide
-  newTag: v20231011-33fbc60185
-# External plugins
-- name: gcr.io/k8s-prow/cherrypicker
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/label_sync
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/needs-rebase
-  newTag: v20231011-33fbc60185
-- name: gcr.io/k8s-prow/jenkins-operator
-  newTag: v20231011-33fbc60185
-
-patches:
-- path: patches/crier.yaml
-- path: patches/deck.yaml
-- path: patches/ghproxy.yaml
-- path: patches/hook.yaml
-- path: patches/horologium.yaml
-- path: patches/prow-controller-manager.yaml
-- path: patches/sinker.yaml
-- path: patches/statusreconciler.yaml
-- path: patches/tide.yaml
-# External plugins
-- path: patches/cherrypicker.yaml
-- path: patches/needs-rebase.yaml
-- path: patches/jenkins-operator.yaml