Skip to content

Commit

Permalink
Upgrade cert-manager to v1.10.0 (openservicemesh#5230)
Browse files Browse the repository at this point in the history 
*Upgrade cert-manager to v1.10.0

Signed-off-by: Keith Mattix II <keithmattix2@gmail.com>
  • Loading branch information
@keithmattix
keithmattix committed Dec 12, 2022
1 parent 7eefefe commit a608528
Show file tree
Hide file tree
Showing 10 changed files with 737 additions and 1,408 deletions.
2 changes: 1 addition & 1 deletion codegen/gen-crd-client.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion demo/deploy-cert-manager.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
267 changes: 149 additions & 118 deletions go.mod
View file

Large diffs are not rendered by default.

1,831 changes: 565 additions & 1,266 deletions go.sum
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkg/certificate/providers/certmanager/certificate_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 6 additions & 7 deletions pkg/certificate/providers/certmanager/certificate_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions pkg/certificate/providers/certmanager/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/certificate/providers/certmanager/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/certificate/providers/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions tests/framework/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit a608528

Please sign in to comment.