Skip to content

Commit b6d2f26

Browse files
authored
Use CM clientset and remove unnecessary CM generated code (#1203)
Signed-off-by: Matthias Wessendorf <[email protected]>
1 parent d0b9462 commit b6d2f26

File tree

88 files changed

+2461
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+2461
-1022
lines changed

hack/update-codegen.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ kube::codegen::gen_client \
4444
--with-watch \
4545
"${REPO_ROOT_DIR}/pkg/apis"
4646

47-
kube::codegen::gen_client \
48-
--boilerplate "${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt" \
49-
--output-dir "${REPO_ROOT_DIR}/pkg/client/certmanager" \
50-
--output-pkg "knative.dev/eventing/pkg/client/certmanager" \
51-
--with-watch \
52-
"${REPO_ROOT_DIR}/vendor/github.com/cert-manager/cert-manager/pkg/apis"
53-
5447
group "Knative Codegen"
5548

5649
# Knative Injection
@@ -60,9 +53,9 @@ ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
6053
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
6154

6255
# Knative Injection (for cert-manager)
56+
OUTPUT_PKG="knative.dev/eventing/pkg/client/certmanager/injection" \
6357
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
64-
knative.dev/eventing/pkg/client/certmanager github.com/cert-manager/cert-manager/pkg/apis \
65-
"certmanager:v1 acme:v1" \
58+
github.com/cert-manager/cert-manager/pkg/client github.com/cert-manager/cert-manager/pkg/apis "certmanager:v1 acme:v1" \
6659
--disable-informer-init \
6760
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
6861

pkg/certificates/certificate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
2828
"go.uber.org/zap"
2929

30+
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
31+
cminformers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions"
32+
cmlistersv1 "github.com/cert-manager/cert-manager/pkg/client/listers/certmanager/v1"
3033
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3134
"k8s.io/client-go/tools/cache"
3235
"knative.dev/eventing/pkg/apis/feature"
33-
cmclient "knative.dev/eventing/pkg/client/certmanager/clientset/versioned"
34-
cminformers "knative.dev/eventing/pkg/client/certmanager/informers/externalversions"
35-
cmlistersv1 "knative.dev/eventing/pkg/client/certmanager/listers/certmanager/v1"
3636
"knative.dev/pkg/controller"
3737
"knative.dev/pkg/injection"
3838
"knative.dev/pkg/kmeta"

pkg/client/certmanager/clientset/versioned/typed/acme/v1/challenge.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

pkg/client/certmanager/clientset/versioned/typed/acme/v1/fake/fake_challenge.go

Lines changed: 0 additions & 48 deletions
This file was deleted.

pkg/client/certmanager/clientset/versioned/typed/acme/v1/fake/fake_order.go

Lines changed: 0 additions & 48 deletions
This file was deleted.

pkg/client/certmanager/clientset/versioned/typed/acme/v1/order.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

pkg/client/certmanager/clientset/versioned/typed/certmanager/v1/certificate.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)