Upgrade cert-manager to v1.10.0 (#5230)

*Upgrade cert-manager to v1.10.0 Signed-off-by: Keith Mattix II <keithmattix2@gmail.com>
openservicemesh · Dec 12, 2022 · 56679ed · 56679ed
1 parent 7eefefe
commit 56679ed
Show file tree

Hide file tree

Showing 16 changed files with 773 additions and 1,436 deletions.
diff --git a/codegen/gen-crd-client.sh b/codegen/gen-crd-client.sh
@@ -38,7 +38,7 @@ ROOT_PACKAGE="github.com/openservicemesh/osm"
 ROOT_DIR="$(git rev-parse --show-toplevel)"
 
 # get code-generator version from go.sum
-CODEGEN_VERSION="v0.23.5" # Must match k8s.io/client-go version defined in go.mod
+CODEGEN_VERSION="v0.25.2" # Must match k8s.io/client-go version defined in go.mod
 CODEGEN_PKG="$(echo `go env GOPATH`/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION})"
 
 echo ">>> using codegen: ${CODEGEN_PKG}"

diff --git a/demo/deploy-cert-manager.sh b/demo/deploy-cert-manager.sh
@@ -44,7 +44,7 @@ return $?
 }
 
 # shellcheck disable=SC2086
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml
 
 kubectl rollout status deploy -n cert-manager cert-manager
 kubectl rollout status deploy -n cert-manager cert-manager-cainjector

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/certificate/providers/certmanager/certificate_manager.go b/pkg/certificate/providers/certmanager/certificate_manager.go
@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"time"
 
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	cmversionedclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
-	cminformers "github.com/jetstack/cert-manager/pkg/client/informers/externalversions"
+	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	cmversionedclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
+	cminformers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/openservicemesh/osm/pkg/certificate"

diff --git a/pkg/certificate/providers/certmanager/certificate_manager_test.go b/pkg/certificate/providers/certmanager/certificate_manager_test.go
@@ -6,14 +6,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/mock/gomock"
+	"github.com/onsi/ginkgo"
 	tassert "github.com/stretchr/testify/assert"
 
-	. "github.com/onsi/ginkgo"
-
-	"github.com/golang/mock/gomock"
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	cmfakeclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/fake"
+	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	cmfakeclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/openservicemesh/osm/pkg/certificate"
@@ -22,7 +21,7 @@ import (
 )
 
 var (
-	mockCtrl         = gomock.NewController(GinkgoT())
+	mockCtrl         = gomock.NewController(ginkgo.GinkgoT())
 	mockConfigurator = configurator.NewMockConfigurator(mockCtrl)
 	crNotReady       = &cmapi.CertificateRequest{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/pkg/certificate/providers/certmanager/helpers.go b/pkg/certificate/providers/certmanager/helpers.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
+	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
 )

diff --git a/pkg/certificate/providers/certmanager/types.go b/pkg/certificate/providers/certmanager/types.go
@@ -2,9 +2,9 @@
 package certmanager
 
 import (
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	cmclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1"
-	cmlisters "github.com/jetstack/cert-manager/pkg/client/listers/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1"
+	cmlisters "github.com/cert-manager/cert-manager/pkg/client/listers/certmanager/v1"
 
 	"github.com/openservicemesh/osm/pkg/logger"
 )

diff --git a/pkg/certificate/providers/config.go b/pkg/certificate/providers/config.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	cmversionedclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	cmversionedclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/gen/client/config/clientset/versioned/clientset.go b/pkg/gen/client/config/clientset/versioned/clientset.go
diff --git a/pkg/gen/client/config/clientset/versioned/fake/register.go b/pkg/gen/client/config/clientset/versioned/fake/register.go
diff --git a/pkg/gen/client/config/clientset/versioned/scheme/register.go b/pkg/gen/client/config/clientset/versioned/scheme/register.go
diff --git a/pkg/gen/client/policy/clientset/versioned/clientset.go b/pkg/gen/client/policy/clientset/versioned/clientset.go
diff --git a/pkg/gen/client/policy/clientset/versioned/fake/register.go b/pkg/gen/client/policy/clientset/versioned/fake/register.go
diff --git a/pkg/gen/client/policy/clientset/versioned/scheme/register.go b/pkg/gen/client/policy/clientset/versioned/scheme/register.go
diff --git a/tests/framework/common.go b/tests/framework/common.go
@@ -21,11 +21,11 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	certman "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
 	"github.com/docker/docker/client"
 	"github.com/fatih/color"
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	certman "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
 
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
@@ -831,7 +831,7 @@ func (td *OsmTestData) installCertManager(instOpts InstallOSMOpts) error {
 	install.RepoURL = "https://charts.jetstack.io"
 	install.Namespace = td.OsmNamespace
 	install.ReleaseName = "certmanager"
-	install.Version = "v1.3.1"
+	install.Version = "v1.10.0"
 
 	chartPath, err := install.LocateChart("cert-manager", helmcli.New())
 	if err != nil {