Skip to content

Commit 56679ed

Browse files
keithmattixkeithmattix
committed
Upgrade cert-manager to v1.10.0 (openservicemesh#5230)
*Upgrade cert-manager to v1.10.0 Signed-off-by: Keith Mattix II <[email protected]>
1 parent 7eefefe commit 56679ed

File tree

16 files changed

+773
-1436
lines changed

16 files changed

+773
-1436
lines changed

‎codegen/gen-crd-client.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ROOT_PACKAGE="github.com/openservicemesh/osm"
3838
ROOT_DIR="$(git rev-parse --show-toplevel)"
3939

4040
# get code-generator version from go.sum
41-
CODEGEN_VERSION="v0.23.5" # Must match k8s.io/client-go version defined in go.mod
41+
CODEGEN_VERSION="v0.25.2" # Must match k8s.io/client-go version defined in go.mod
4242
CODEGEN_PKG="$(echo `go env GOPATH`/pkg/mod/k8s.io/code-generator@${CODEGEN_VERSION})"
4343

4444
echo ">>> using codegen: ${CODEGEN_PKG}"

‎demo/deploy-cert-manager.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ return $?
4444
}
4545

4646
# shellcheck disable=SC2086
47-
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml
47+
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v$CERT_MANAGER_VERSION/cert-manager.yaml
4848

4949
kubectl rollout status deploy -n cert-manager cert-manager
5050
kubectl rollout status deploy -n cert-manager cert-manager-cainjector

‎go.mod

+149-118
Large diffs are not rendered by default.

‎go.sum

+565-1,266
Large diffs are not rendered by default.

‎pkg/certificate/providers/certmanager/certificate_manager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"fmt"
1111
"time"
1212

13-
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
14-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
15-
cmversionedclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
16-
cminformers "github.com/jetstack/cert-manager/pkg/client/informers/externalversions"
13+
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
14+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
15+
cmversionedclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
16+
cminformers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818

1919
"github.com/openservicemesh/osm/pkg/certificate"

‎pkg/certificate/providers/certmanager/certificate_manager_test.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import (
66
"testing"
77
"time"
88

9+
"github.com/golang/mock/gomock"
10+
"github.com/onsi/ginkgo"
911
tassert "github.com/stretchr/testify/assert"
1012

11-
. "github.com/onsi/ginkgo"
12-
13-
"github.com/golang/mock/gomock"
14-
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
15-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
16-
cmfakeclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/fake"
13+
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
14+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
15+
cmfakeclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
1716
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1817

1918
"github.com/openservicemesh/osm/pkg/certificate"
@@ -22,7 +21,7 @@ import (
2221
)
2322

2423
var (
25-
mockCtrl = gomock.NewController(GinkgoT())
24+
mockCtrl = gomock.NewController(ginkgo.GinkgoT())
2625
mockConfigurator = configurator.NewMockConfigurator(mockCtrl)
2726
crNotReady = &cmapi.CertificateRequest{
2827
ObjectMeta: metav1.ObjectMeta{

‎pkg/certificate/providers/certmanager/helpers.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"time"
66

7-
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
8-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
7+
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
8+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
99
apierrors "k8s.io/apimachinery/pkg/api/errors"
1010
"k8s.io/apimachinery/pkg/util/wait"
1111
)

‎pkg/certificate/providers/certmanager/types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
package certmanager
33

44
import (
5-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
6-
cmclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1"
7-
cmlisters "github.com/jetstack/cert-manager/pkg/client/listers/certmanager/v1"
5+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
6+
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/typed/certmanager/v1"
7+
cmlisters "github.com/cert-manager/cert-manager/pkg/client/listers/certmanager/v1"
88

99
"github.com/openservicemesh/osm/pkg/logger"
1010
)

‎pkg/certificate/providers/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"fmt"
77
"time"
88

9-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
10-
cmversionedclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
9+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
10+
cmversionedclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
1111

1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/client-go/kubernetes"

‎pkg/gen/client/config/clientset/versioned/clientset.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/gen/client/config/clientset/versioned/fake/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/gen/client/config/clientset/versioned/scheme/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/gen/client/policy/clientset/versioned/clientset.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/gen/client/policy/clientset/versioned/fake/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/gen/client/policy/clientset/versioned/scheme/register.go

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/framework/common.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
. "github.com/onsi/ginkgo"
2222
. "github.com/onsi/gomega"
2323

24+
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
25+
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
26+
certman "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
2427
"github.com/docker/docker/client"
2528
"github.com/fatih/color"
26-
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
27-
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
28-
certman "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
2929

3030
"helm.sh/helm/v3/pkg/action"
3131
"helm.sh/helm/v3/pkg/chart/loader"
@@ -831,7 +831,7 @@ func (td *OsmTestData) installCertManager(instOpts InstallOSMOpts) error {
831831
install.RepoURL = "https://charts.jetstack.io"
832832
install.Namespace = td.OsmNamespace
833833
install.ReleaseName = "certmanager"
834-
install.Version = "v1.3.1"
834+
install.Version = "v1.10.0"
835835

836836
chartPath, err := install.LocateChart("cert-manager", helmcli.New())
837837
if err != nil {

0 commit comments

Comments
 (0)