diff --git a/.ci-operator.yaml b/.ci-operator.yaml index b5bc53713..501e55dcb 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: namespace: ci name: kcp-dev-build-root - tag: "1.18" + tag: "1.19" diff --git a/Makefile b/Makefile index 7e828b7d7..e9b8dd0ec 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,6 @@ $(KUBE_LISTER_GEN): GOBIN=$(GOBIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/$(KUBE_LISTER_GEN_BIN) $(KUBE_LISTER_GEN_BIN) $(KUBE_LISTER_GEN_VER) $(KUBE_INFORMER_GEN): GOBIN=$(GOBIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/$(KUBE_INFORMER_GEN_BIN) $(KUBE_INFORMER_GEN_BIN) $(KUBE_INFORMER_GEN_VER) -$(KUBE_INFORMER_GEN): - GOBIN=$(GOBIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/$(KUBE_INFORMER_GEN_BIN) $(KUBE_INFORMER_GEN_BIN) $(KUBE_INFORMER_GEN_VER) $(KUBE_APPLYCONFIGURATION_GEN): GOBIN=$(GOBIN_DIR) $(GO_INSTALL) k8s.io/code-generator/cmd/$(KUBE_APPLYCONFIGURATION_GEN_BIN) $(KUBE_APPLYCONFIGURATION_GEN_BIN) $(KUBE_APPLYCONFIGURATION_GEN_VER) diff --git a/examples/go.mod b/examples/go.mod index 0dd183bb9..9159f1c4a 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -1,6 +1,6 @@ module acme.corp -go 1.18 +go 1.19 replace acme.corp/pkg => ./pkg diff --git a/examples/pkg/generated/clientset/versioned/fake/register.go b/examples/pkg/generated/clientset/versioned/fake/register.go index 1a2acace8..c14af910e 100644 --- a/examples/pkg/generated/clientset/versioned/fake/register.go +++ b/examples/pkg/generated/clientset/versioned/fake/register.go @@ -50,14 +50,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/examples/pkg/generated/clientset/versioned/scheme/register.go b/examples/pkg/generated/clientset/versioned/scheme/register.go index a1fedbb38..789edeba1 100644 --- a/examples/pkg/generated/clientset/versioned/scheme/register.go +++ b/examples/pkg/generated/clientset/versioned/scheme/register.go @@ -50,14 +50,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go index fc5edc34f..225988045 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/example_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/example_client.go index b3158ac2e..4d17ddb58 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/example_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/testtype.go index ceeab22a4..7225b9188 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go index 7cb12eaae..583dd9c06 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go index e178feb82..e28612369 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go index c054f4ca8..dfe8f2c45 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go index 816c90c79..0fabc3f82 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go index 16a2b664a..898b28710 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go index 7fbcf0dfa..740c72a82 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go index 387341cbf..577bc4d7b 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go index 989e44060..50ed201a6 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/example_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/example_client.go index ea125381f..1f236aa43 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/example_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/testtype.go index c08d6fc1c..f565b8a4c 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example/v2/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go index d8a584596..5905b6d77 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go index 7c30de0aa..c88f0c78e 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/testtype.go index f2142c38b..a48cedad0 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/example3/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go index 21293d246..3db29e205 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go index 5bd7e10d3..57d89259f 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go index 9c6d8672c..8279dd6a9 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go index a649bbce7..bfa081276 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go index 9ec473dca..92be820b3 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go index 3ba3bbd7b..f820e4c88 100644 --- a/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go +++ b/examples/pkg/kcp/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go index fc5edc34f..225988045 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/example_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/example_client.go index d8a8f9224..8df712207 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/example_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/testtype.go index 6a0ff967f..3d59c5df3 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go index be94c3bcd..831e4f564 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1/fake/withoutverbtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go index e178feb82..e28612369 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go index 2e7a3d6d9..7f11d0bab 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go index 61788fb0a..ca5bbb7d9 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1alpha1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1alpha1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go index 16a2b664a..898b28710 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go index 4db17aa5b..4ead5bb77 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go index 7fe798e1a..be3536bca 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v1beta1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1beta1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go index 989e44060..50ed201a6 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/example_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/example_client.go index c1ab79a60..b84f4b22d 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/example_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/example_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/testtype.go index fe5214b71..58af8e051 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example/v2/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v2 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go index d8a584596..5905b6d77 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go index cef7c9784..3443f9898 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/example3_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/testtype.go index 0cf3207cc..4c24bdd12 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/example3/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go index 21293d246..3db29e205 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go index 279def979..4b909c615 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/existinginterfaces_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go index 1114ec920..b0e7bc947 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/existinginterfaces/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go index a649bbce7..bfa081276 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/clustertesttype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go index 182766f12..b4ce6cdd9 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/secondexample_client.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "github.com/kcp-dev/logicalcluster/v3" diff --git a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go index b2bdba97f..4346645f7 100644 --- a/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go +++ b/examples/pkg/kcpexisting/clients/clientset/versioned/typed/secondexample/v1/fake/testtype.go @@ -19,7 +19,7 @@ limitations under the License. // Code generated by kcp code-generator. DO NOT EDIT. -package v1 +package fake import ( "context" diff --git a/go.mod b/go.mod index 940bb372e..11da0cb74 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kcp-dev/code-generator/v2 -go 1.18 +go 1.19 require ( github.com/onsi/ginkgo v1.16.5 diff --git a/pkg/internal/clientgen/fake_group.go b/pkg/internal/clientgen/fake_group.go index 815d04813..cd3b96b0b 100644 --- a/pkg/internal/clientgen/fake_group.go +++ b/pkg/internal/clientgen/fake_group.go @@ -52,7 +52,7 @@ var fakeGroup = ` // Code generated by kcp code-generator. DO NOT EDIT. -package {{.group.Version.PackageName}} +package fake import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" diff --git a/pkg/internal/clientgen/fake_type.go b/pkg/internal/clientgen/fake_type.go index f49f4ff4b..38aad993d 100644 --- a/pkg/internal/clientgen/fake_type.go +++ b/pkg/internal/clientgen/fake_type.go @@ -133,7 +133,7 @@ var fakeTypedClient = ` // Code generated by kcp code-generator. DO NOT EDIT. -package {{.group.Version.PackageName}} +package fake import ( "github.com/kcp-dev/logicalcluster/v3"