Merge pull request #452 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

klone.yaml

@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
+      repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
       repo_path: modules/tools

make/_shared/tools/00_mod.mk

@@ -116,28 +116,30 @@ tools += ginkgo=$(detected_ginkgo_version)
 tools += klone=v0.1.0
 # https://pkg.go.dev/github.com/goreleaser/goreleaser?tab=versions
 tools += goreleaser=v1.26.2
-# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
+# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions. We are still
+# using an old version (0.100.0, Jan 2024) because all of the latest versions
+# use a replace statement, and thus cannot be installed using `go build`.
 tools += syft=v0.100.0
 # https://github.com/cert-manager/helm-tool
 tools += helm-tool=v0.5.3
 # https://github.com/cert-manager/cmctl
-tools += cmctl=v2.1.0
+tools += cmctl=v2.1.1
 # https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
-tools += cmrel=e4c3a4dc07df5c7c0379d334c5bb00e172462551
+tools += cmrel=e3cbe5171488deda000145003e22567bdce622ea
 # https://github.com/golangci/golangci-lint/releases
-tools += golangci-lint=v1.61.0
+tools += golangci-lint=v1.62.2
 # https://pkg.go.dev/golang.org/x/vuln?tab=versions
 tools += govulncheck=v1.1.3
 # https://pkg.go.dev/github.com/operator-framework/operator-sdk/cmd/operator-sdk?tab=versions
-tools += operator-sdk=v1.36.1
+tools += operator-sdk=v1.38.0
 # https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
-tools += gh=v2.54.0
+tools += gh=v2.63.1
 # https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
-tools += preflight=1.10.0
+tools += preflight=1.10.2
 # https://github.com/daixiang0/gci/releases
-tools += gci=v0.13.4
+tools += gci=v0.13.5
 # https://github.com/google/yamlfmt/releases
-tools += yamlfmt=v0.13.0
+tools += yamlfmt=v0.14.0
 
 # https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
 K8S_CODEGEN_VERSION := v0.31.0
@@ -598,8 +600,8 @@ $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(
 		chmod +x $(outfile); \
 		rm $(outfile).tar.gz
 
-preflight_linux_amd64_SHA256SUM=97750df31f31200f073e3b2844628a0a3681a403648c76d12319f83c80666104
-preflight_linux_arm64_SHA256SUM=e12b2afe063c07ee75f69f285f8cc56be99b85e2abac99cbef5fb22b91ef0cb7
+preflight_linux_amd64_SHA256SUM=776d04669304d3185c40522bed9a6dc1aa9cd80014a203fe01552b98bfa9554b
+preflight_linux_arm64_SHA256SUM=dd7b0a144892ce6fc47d1bc44e344130fa9ff997bf2c39de3016873d8bd3fac5
 
 # Currently there are no official releases for darwin, you cannot submit results
 # on non-official binaries, but we can still run tests.

test/e2e/suite/namespace/namespace.go

@@ -69,11 +69,8 @@ var _ = framework.CasesDescribe("CA Root Controller", func() {
 		certSecret, err := f.KubeClientSet.CoreV1().Secrets(cmNamespace).Get(ctx, testName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
-		var ok bool
-		rootCA, ok = certSecret.Data[cmmeta.TLSCAKey]
-		if !ok || len(rootCA) == 0 {
-			Expect(certSecret, "failed to find root CA key in test certificate secret").NotTo(HaveOccurred())
-		}
+		rootCA = certSecret.Data[cmmeta.TLSCAKey]
+		Expect(rootCA).NotTo(BeEmpty(), "failed to find root CA key in test certificate secret")
 	})
 
 	JustAfterEach(func() {
@@ -149,7 +146,7 @@ var _ = framework.CasesDescribe("CA Root Controller", func() {
 
 			cm, err = f.KubeClientSet.CoreV1().ConfigMaps(ns.Name).Update(ctx, cm, metav1.UpdateOptions{})
 			return err
-		}).Should(BeNil())
+		}).Should(Succeed())
 
 		Expect(expectRootCAExists(ctx, f, ns.Name, rootCA)).NotTo(HaveOccurred())
 	})

test/e2e/suite/request/request.go

@@ -57,11 +57,8 @@ var _ = framework.CasesDescribe("Request Authentication", func() {
 		cm, err := f.KubeClientSet.CoreV1().ConfigMaps("istio-system").Get(context.TODO(), "istio-ca-root-cert", metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
-		var ok bool
-		rootCA, ok = cm.Data["root-cert.pem"]
-		if !ok {
-			Expect(cm, "expected CA root cert not present").NotTo(HaveOccurred())
-		}
+		rootCA = cm.Data["root-cert.pem"]
+		Expect(rootCA).NotTo(BeEmpty(), "expected CA root cert not present")
 
 		ns, err := f.KubeClientSet.CoreV1().Namespaces().Create(context.TODO(), &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
@@ -215,16 +212,11 @@ var _ = framework.CasesDescribe("Request Authentication", func() {
 
 		roots := x509.NewCertPool()
 		ok := roots.AppendCertsFromPEM([]byte(rootCA))
-		if !ok {
-			Expect("failed to append root certificate").NotTo(HaveOccurred())
-		}
+		Expect(ok).To(BeTrue(), "failed to append root certificate")
 
 		for i, certPEM := range certs {
 			block, _ := pem.Decode([]byte(certPEM))
-			if block == nil {
-				Expect("failed to parse certificate PEM").NotTo(HaveOccurred())
-				return
-			}
+			Expect(block).NotTo(BeNil(), "failed to parse certificate PEM")
 
 			cert, err := x509.ParseCertificate(block.Bytes)
 			if err != nil {