From 68f5e698828441584ce537fadfb082a6366dc09c Mon Sep 17 00:00:00 2001
From: Stephen Augustus <foo@auggie.dev>
Date: Sat, 2 Oct 2021 23:58:39 -0700
Subject: [PATCH] releng(kpromo): Bump images to v3.3.0-beta.0-1

Signed-off-by: Stephen Augustus <foo@auggie.dev>
---
 .../releng/artifact-promotion-presubmits.yaml | 18 +++++++----------
 .../trusted/releng/releng-trusted.yaml        | 20 +++++++++----------
 .../test-infra/test-infra-trusted.yaml        |  6 +++---
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml b/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml
index 940c57243757..99a0fd9cae0b 100644
--- a/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml
+++ b/config/jobs/kubernetes/sig-k8s-infra/releng/artifact-promotion-presubmits.yaml
@@ -13,14 +13,11 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
-        - cip
+        - /kpromo
         args:
-        - run
-        # Pod Utilities already sets pwd to
-        # /home/prow/go/src/github.com/{{.Org}}/{{.Repo}}, so just '.' should
-        # suffice, but it's nice to be explicit.
+        - cip
         - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
   # Check that images to be promoted are free of fixable vulnerabilities
   - name: pull-k8sio-cip-vuln
@@ -37,11 +34,11 @@ presubmits:
     spec:
       serviceAccountName: k8s-infra-gcr-vuln-scanning
       containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
-        - cip
+        - /kpromo
         args:
-        - run
+        - cip
         - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
         - --vuln-severity-threshold=1
   # Check that changes to backup scripts are valid.
@@ -80,11 +77,10 @@ presubmits:
     - ^main$
     spec:
       containers:
-      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.2.0-1
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
         - /kpromo
         args:
         - run
         - files
         - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/
-        - --dry-run=true
diff --git a/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml b/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml
index 1b62c82e69c1..dadcacd22d85 100644
--- a/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml
+++ b/config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml
@@ -13,14 +13,14 @@ postsubmits:
     spec:
       serviceAccountName: k8s-infra-promoter
       containers:
-      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.2.0-1
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
         - /kpromo
         args:
         - run
         - files
         - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/
-        - --dry-run=false
+        - --confirm
     annotations:
       testgrid-dashboards: sig-release-releng-blocking, sig-k8s-infra-k8sio
       testgrid-alert-email: k8s-infra-alerts@kubernetes.io, release-managers+alerts@kubernetes.io
@@ -38,11 +38,11 @@ postsubmits:
     spec:
       serviceAccountName: k8s-infra-gcr-promoter
       containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
-        - cip
+        - /kpromo
         args:
-        - run
+        - cip
         - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
         - --confirm
     annotations:
@@ -64,14 +64,14 @@ periodics:
   spec:
     serviceAccountName: k8s-infra-promoter
     containers:
-    - image: k8s.gcr.io/artifact-promoter/kpromo:v3.2.0-1
+    - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
       command:
       - /kpromo
       args:
       - run
       - files
       - --manifests=/home/prow/go/src/github.com/kubernetes/k8s.io/artifacts/
-      - --dry-run=false
+      - --confirm
   annotations:
     testgrid-dashboards: sig-release-releng-blocking, sig-k8s-infra-k8sio
     testgrid-alert-email: k8s-infra-alerts@kubernetes.io, release-managers+alerts@kubernetes.io
@@ -102,11 +102,11 @@ periodics:
     # https://github.com/kubernetes/k8s.io/pull/695.
     serviceAccountName: k8s-infra-gcr-promoter
     containers:
-    - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+    - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
       command:
-      - cip
+      - /kpromo
       args:
-      - run
+      - cip
       - --thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
       - --confirm
   annotations:
diff --git a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
index 7aa91142b368..60a3a3cf0a75 100644
--- a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
+++ b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
@@ -474,11 +474,11 @@ postsubmits:
     spec:
       serviceAccountName: pusher
       containers:
-      - image: k8s.gcr.io/artifact-promoter/cip:v3.2.0
+      - image: k8s.gcr.io/artifact-promoter/kpromo:v3.3.0-beta.0-1
         command:
-        - cip
+        - /kpromo
         args:
-        - run
+        - cip
         - --manifest=prow/cip-manifest.yaml
         - --confirm
     annotations: