move to pkg/client

knative · Apr 25, 2024 · 177f361 · 177f361
1 parent 049ac7b
commit 177f361
Show file tree

Hide file tree

Showing 87 changed files with 149 additions and 150 deletions.
diff --git a/.codecov.yaml b/.codecov.yaml
@@ -19,7 +19,6 @@ ignore:
   - "**/*.pb.go" # Ignore proto-generated files.
   - "hack"
   - "pkg/client"
-  - "pkg/netcertmanager/client"
   - "test"
   - "third_party"
   - "vendor"
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -44,12 +44,12 @@ import (
 	"knative.dev/serving/pkg/reconciler/serverlessservice"
 	"knative.dev/serving/pkg/reconciler/service"
 
-	versioned "knative.dev/serving/pkg/netcertmanager/client/certmanager/clientset/versioned"
-	"knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/acme/v1/challenge"
-	v1certificate "knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/certificate"
-	"knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/certificaterequest"
-	"knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/clusterissuer"
-	"knative.dev/serving/pkg/netcertmanager/client/certmanager/injection/informers/certmanager/v1/issuer"
+	versioned "knative.dev/serving/pkg/client/certmanager/clientset/versioned"
+	"knative.dev/serving/pkg/client/certmanager/injection/informers/acme/v1/challenge"
+	v1certificate "knative.dev/serving/pkg/client/certmanager/injection/informers/certmanager/v1/certificate"
+	"knative.dev/serving/pkg/client/certmanager/injection/informers/certmanager/v1/certificaterequest"
+	"knative.dev/serving/pkg/client/certmanager/injection/informers/certmanager/v1/clusterissuer"
+	"knative.dev/serving/pkg/client/certmanager/injection/informers/certmanager/v1/issuer"
 )
 
 var ctors = []injection.ControllerConstructor{

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -71,7 +71,7 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
 
 # Generate our own client for cert-manager (otherwise injection won't work)
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
-  knative.dev/serving/pkg/netcertmanager/client/certmanager github.com/cert-manager/cert-manager/pkg/apis \
+  knative.dev/serving/pkg/client/certmanager github.com/cert-manager/cert-manager/pkg/apis \
   "certmanager:v1 acme:v1" \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt
 
@@ -85,7 +85,7 @@ ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
 
 # Knative Injection (for cert-manager)
 ${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
-  knative.dev/serving/pkg/netcertmanager/client/certmanager github.com/cert-manager/cert-manager/pkg/apis \
+  knative.dev/serving/pkg/client/certmanager github.com/cert-manager/cert-manager/pkg/apis \
   "certmanager:v1 acme:v1" \
   --disable-informer-init \
   --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

diff --git a/...tmanager/clientset/versioned/clientset.go → ...tmanager/clientset/versioned/clientset.go b/...tmanager/clientset/versioned/clientset.go → ...tmanager/clientset/versioned/clientset.go
diff --git a/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go b/...set/versioned/fake/clientset_generated.go → ...set/versioned/fake/clientset_generated.go
diff --git a/...rtmanager/clientset/versioned/fake/doc.go → ...rtmanager/clientset/versioned/fake/doc.go b/...rtmanager/clientset/versioned/fake/doc.go → ...rtmanager/clientset/versioned/fake/doc.go
diff --git a/...ager/clientset/versioned/fake/register.go → ...ager/clientset/versioned/fake/register.go b/...ager/clientset/versioned/fake/register.go → ...ager/clientset/versioned/fake/register.go
diff --git a/...manager/clientset/versioned/scheme/doc.go → ...manager/clientset/versioned/scheme/doc.go b/...manager/clientset/versioned/scheme/doc.go → ...manager/clientset/versioned/scheme/doc.go
diff --git a/...er/clientset/versioned/scheme/register.go → ...er/clientset/versioned/scheme/register.go b/...er/clientset/versioned/scheme/register.go → ...er/clientset/versioned/scheme/register.go
diff --git a/...et/versioned/typed/acme/v1/acme_client.go → ...et/versioned/typed/acme/v1/acme_client.go b/...et/versioned/typed/acme/v1/acme_client.go → ...et/versioned/typed/acme/v1/acme_client.go
diff --git a/...tset/versioned/typed/acme/v1/challenge.go → ...tset/versioned/typed/acme/v1/challenge.go b/...tset/versioned/typed/acme/v1/challenge.go → ...tset/versioned/typed/acme/v1/challenge.go
diff --git a/.../clientset/versioned/typed/acme/v1/doc.go → .../clientset/versioned/typed/acme/v1/doc.go b/.../clientset/versioned/typed/acme/v1/doc.go → .../clientset/versioned/typed/acme/v1/doc.go
diff --git a/...ntset/versioned/typed/acme/v1/fake/doc.go → ...ntset/versioned/typed/acme/v1/fake/doc.go b/...ntset/versioned/typed/acme/v1/fake/doc.go → ...ntset/versioned/typed/acme/v1/fake/doc.go
diff --git a/...ed/typed/acme/v1/fake/fake_acme_client.go → ...ed/typed/acme/v1/fake/fake_acme_client.go b/...ed/typed/acme/v1/fake/fake_acme_client.go → ...ed/typed/acme/v1/fake/fake_acme_client.go
diff --git a/...oned/typed/acme/v1/fake/fake_challenge.go → ...oned/typed/acme/v1/fake/fake_challenge.go b/...oned/typed/acme/v1/fake/fake_challenge.go → ...oned/typed/acme/v1/fake/fake_challenge.go
diff --git a/...ersioned/typed/acme/v1/fake/fake_order.go → ...ersioned/typed/acme/v1/fake/fake_order.go b/...ersioned/typed/acme/v1/fake/fake_order.go → ...ersioned/typed/acme/v1/fake/fake_order.go
diff --git a/...oned/typed/acme/v1/generated_expansion.go → ...oned/typed/acme/v1/generated_expansion.go b/...oned/typed/acme/v1/generated_expansion.go → ...oned/typed/acme/v1/generated_expansion.go
diff --git a/...lientset/versioned/typed/acme/v1/order.go → ...lientset/versioned/typed/acme/v1/order.go b/...lientset/versioned/typed/acme/v1/order.go → ...lientset/versioned/typed/acme/v1/order.go
diff --git a/...ioned/typed/certmanager/v1/certificate.go → ...ioned/typed/certmanager/v1/certificate.go b/...ioned/typed/certmanager/v1/certificate.go → ...ioned/typed/certmanager/v1/certificate.go
diff --git a/...yped/certmanager/v1/certificaterequest.go → ...yped/certmanager/v1/certificaterequest.go b/...yped/certmanager/v1/certificaterequest.go → ...yped/certmanager/v1/certificaterequest.go
diff --git a/...yped/certmanager/v1/certmanager_client.go → ...yped/certmanager/v1/certmanager_client.go b/...yped/certmanager/v1/certmanager_client.go → ...yped/certmanager/v1/certmanager_client.go
diff --git a/...ned/typed/certmanager/v1/clusterissuer.go → ...ned/typed/certmanager/v1/clusterissuer.go b/...ned/typed/certmanager/v1/clusterissuer.go → ...ned/typed/certmanager/v1/clusterissuer.go
diff --git a/...set/versioned/typed/certmanager/v1/doc.go → ...set/versioned/typed/certmanager/v1/doc.go b/...set/versioned/typed/certmanager/v1/doc.go → ...set/versioned/typed/certmanager/v1/doc.go
diff --git a/...ersioned/typed/certmanager/v1/fake/doc.go → ...ersioned/typed/certmanager/v1/fake/doc.go b/...ersioned/typed/certmanager/v1/fake/doc.go → ...ersioned/typed/certmanager/v1/fake/doc.go
diff --git a/...d/certmanager/v1/fake/fake_certificate.go → ...d/certmanager/v1/fake/fake_certificate.go b/...d/certmanager/v1/fake/fake_certificate.go → ...d/certmanager/v1/fake/fake_certificate.go
diff --git a/...anager/v1/fake/fake_certificaterequest.go → ...anager/v1/fake/fake_certificaterequest.go b/...anager/v1/fake/fake_certificaterequest.go → ...anager/v1/fake/fake_certificaterequest.go
diff --git a/...anager/v1/fake/fake_certmanager_client.go → ...anager/v1/fake/fake_certmanager_client.go b/...anager/v1/fake/fake_certmanager_client.go → ...anager/v1/fake/fake_certmanager_client.go
diff --git a/...certmanager/v1/fake/fake_clusterissuer.go → ...certmanager/v1/fake/fake_clusterissuer.go b/...certmanager/v1/fake/fake_clusterissuer.go → ...certmanager/v1/fake/fake_clusterissuer.go
diff --git a/.../typed/certmanager/v1/fake/fake_issuer.go → .../typed/certmanager/v1/fake/fake_issuer.go b/.../typed/certmanager/v1/fake/fake_issuer.go → .../typed/certmanager/v1/fake/fake_issuer.go
diff --git a/...ped/certmanager/v1/generated_expansion.go → ...ped/certmanager/v1/generated_expansion.go b/...ped/certmanager/v1/generated_expansion.go → ...ped/certmanager/v1/generated_expansion.go
diff --git a/.../versioned/typed/certmanager/v1/issuer.go → .../versioned/typed/certmanager/v1/issuer.go b/.../versioned/typed/certmanager/v1/issuer.go → .../versioned/typed/certmanager/v1/issuer.go
diff --git a/...ormers/externalversions/acme/interface.go → ...ormers/externalversions/acme/interface.go b/...ormers/externalversions/acme/interface.go → ...ormers/externalversions/acme/interface.go
diff --git a/...ers/externalversions/acme/v1/challenge.go → ...ers/externalversions/acme/v1/challenge.go b/...ers/externalversions/acme/v1/challenge.go → ...ers/externalversions/acme/v1/challenge.go
diff --git a/...ers/externalversions/acme/v1/interface.go → ...ers/externalversions/acme/v1/interface.go b/...ers/externalversions/acme/v1/interface.go → ...ers/externalversions/acme/v1/interface.go
diff --git a/...formers/externalversions/acme/v1/order.go → ...formers/externalversions/acme/v1/order.go b/...formers/externalversions/acme/v1/order.go → ...formers/externalversions/acme/v1/order.go
diff --git a/...externalversions/certmanager/interface.go → ...externalversions/certmanager/interface.go b/...externalversions/certmanager/interface.go → ...externalversions/certmanager/interface.go
diff --git a/...nalversions/certmanager/v1/certificate.go → ...nalversions/certmanager/v1/certificate.go b/...nalversions/certmanager/v1/certificate.go → ...nalversions/certmanager/v1/certificate.go
diff --git a/...ions/certmanager/v1/certificaterequest.go → ...ions/certmanager/v1/certificaterequest.go b/...ions/certmanager/v1/certificaterequest.go → ...ions/certmanager/v1/certificaterequest.go
diff --git a/...lversions/certmanager/v1/clusterissuer.go → ...lversions/certmanager/v1/clusterissuer.go b/...lversions/certmanager/v1/clusterissuer.go → ...lversions/certmanager/v1/clusterissuer.go
diff --git a/...ernalversions/certmanager/v1/interface.go → ...ernalversions/certmanager/v1/interface.go b/...ernalversions/certmanager/v1/interface.go → ...ernalversions/certmanager/v1/interface.go
diff --git a/...externalversions/certmanager/v1/issuer.go → ...externalversions/certmanager/v1/issuer.go b/...externalversions/certmanager/v1/issuer.go → ...externalversions/certmanager/v1/issuer.go
diff --git a/...ger/informers/externalversions/factory.go → ...ger/informers/externalversions/factory.go b/...ger/informers/externalversions/factory.go → ...ger/informers/externalversions/factory.go
diff --git a/...ger/informers/externalversions/generic.go → ...ger/informers/externalversions/generic.go b/...ger/informers/externalversions/generic.go → ...ger/informers/externalversions/generic.go
diff --git a/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go b/.../internalinterfaces/factory_interfaces.go → .../internalinterfaces/factory_interfaces.go
diff --git a/...nt/certmanager/injection/client/client.go → ...nt/certmanager/injection/client/client.go b/...nt/certmanager/injection/client/client.go → ...nt/certmanager/injection/client/client.go
diff --git a/...certmanager/injection/client/fake/fake.go → ...certmanager/injection/client/fake/fake.go b/...certmanager/injection/client/fake/fake.go → ...certmanager/injection/client/fake/fake.go
diff --git a/.../informers/acme/v1/challenge/challenge.go → .../informers/acme/v1/challenge/challenge.go b/.../informers/acme/v1/challenge/challenge.go → .../informers/acme/v1/challenge/challenge.go
diff --git a/.../informers/acme/v1/challenge/fake/fake.go → .../informers/acme/v1/challenge/fake/fake.go b/.../informers/acme/v1/challenge/fake/fake.go → .../informers/acme/v1/challenge/fake/fake.go