Merge pull request #6984 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

hack/verify-upgrade.sh

@@ -84,7 +84,7 @@ $helm upgrade \
     "$HELM_CHART"
 
 # Wait for the cert-manager api to be available
-$cmctl check api --wait=2m -v
+$cmctl check api --wait=2m -v=5
 
 echo "+++ Creating some cert-manager resources.."
 
@@ -100,7 +100,7 @@ $kubectl wait --for=condition=Ready cert/test1 --timeout=180s
 make e2e-setup-certmanager
 
 # Wait for the cert-manager api to be available
-$cmctl check api --wait=2m -v
+$cmctl check api --wait=2m -v=5
 
 # Test that the existing cert-manager resources can still be retrieved
 $kubectl get issuer/selfsigned-issuer cert/test1
@@ -145,7 +145,7 @@ $kubectl wait \
 	--namespace "${NAMESPACE}"
 
 # Wait for the cert-manager api to be available
-$cmctl check api --wait=2m -v
+$cmctl check api --wait=2m -v=5
 
 # Create a cert-manager issuer and cert
 $kubectl apply -f "${REPO_ROOT}/test/fixtures/cert-manager-resources.yaml" --selector=test="first"
@@ -187,7 +187,7 @@ until $rollout_cmd; do
 done
 
 # Wait for the cert-manager api to be available
-$cmctl check api --wait=2m -v
+$cmctl check api --wait=2m -v=5
 
 # Test that the existing cert-manager resources can still be retrieved
 $kubectl get issuer/selfsigned-issuer cert/test1

klone.yaml

@@ -10,35 +10,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 23b4de4ac804dff0e4e2fd687b5a04631b912dea
+      repo_hash: ed50ac284f8e2a389ee33d4dcb90eb4de108bb98
       repo_path: modules/tools