Merge pull request openshift#3179 from stevekuznetsov/skuznets/typed-…

…clients HOSTEDCP-1256: generate typed clients for apis
bryan-cox · Nov 14, 2023 · 15ce0af · 15ce0af
2 parents 4a278b6 + a60076d
commit 15ce0af
Show file tree

Hide file tree

Showing 1,035 changed files with 82,206 additions and 14,049 deletions.
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ pre-commit: all verify test
 build: hypershift-operator control-plane-operator hypershift product-cli
 
 .PHONY: update
-update: deps api api-docs app-sre-saas-template
+update: deps api api-docs app-sre-saas-template clients
 
 .PHONY: verify
 verify: update staticcheck fmt vet promtool
@@ -90,9 +90,9 @@ api: hypershift-api cluster-api cluster-api-provider-aws cluster-api-provider-ib
 
 .PHONY: hypershift-api
 hypershift-api: $(CONTROLLER_GEN)
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/hypershift/..."
 	rm -rf cmd/install/assets/hypershift-operator/*.yaml
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/hypershift/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
 
 .PHONY: cluster-api
 cluster-api: $(CONTROLLER_GEN)
@@ -131,6 +131,10 @@ cluster-api-provider-azure: $(CONTROLLER_GEN)
 api-docs: $(GENAPIDOCS)
 	hack/gen-api-docs.sh $(GENAPIDOCS) $(DIR)
 
+.PHONY: clients
+clients:
+	hack/update-codegen.sh
+
 
 .PHONY: release
 release:

diff --git a/api/fixtures/example.go b/api/fixtures/example.go
@@ -13,8 +13,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
 
 	configv1 "github.com/openshift/api/config/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/api/fixtures/example_aws.go b/api/fixtures/example_aws.go
@@ -1,7 +1,7 @@
 package fixtures
 
 import (
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 type ExampleAWSOptions struct {

diff --git a/api/fixtures/example_ibmcloud_powervs.go b/api/fixtures/example_ibmcloud_powervs.go
@@ -4,7 +4,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 type ExamplePowerVSOptions struct {

diff --git a/api/fixtures/example_kubevirt.go b/api/fixtures/example_kubevirt.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apiresource "k8s.io/apimachinery/pkg/api/resource"
 )

diff --git a/api/v1alpha1/capi_types.go → api/hypershift/v1alpha1/capi_types.go b/api/v1alpha1/capi_types.go → api/hypershift/v1alpha1/capi_types.go
diff --git a/api/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go b/api/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go
diff --git a/api/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go b/api/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go
diff --git a/api/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go b/api/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go
diff --git a/api/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go b/api/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go
diff --git a/api/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go
@@ -12,9 +12,17 @@ var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "hypershift.openshift.io", Version: "v1alpha1"}
 
+	SchemeGroupVersion = GroupVersion
+
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+// Resource generated code relies on this being here, but it logically belongs to the group
+// DEPRECATED
+func Resource(resource string) schema.GroupResource {
+	return schema.GroupResource{Group: GroupVersion.Group, Resource: resource}
+}
diff --git a/api/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go b/api/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go
diff --git a/api/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go b/api/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go
diff --git a/api/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go b/api/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go
diff --git a/api/v1alpha1/zz_conversion.go → api/hypershift/v1alpha1/zz_conversion.go b/api/v1alpha1/zz_conversion.go → api/hypershift/v1alpha1/zz_conversion.go
@@ -8,9 +8,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/configrefs"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	"github.com/openshift/hypershift/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/api/v1alpha1/zz_conversion_test.go → ...hypershift/v1alpha1/zz_conversion_test.go b/api/v1alpha1/zz_conversion_test.go → ...hypershift/v1alpha1/zz_conversion_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	fuzz "github.com/google/gofuzz"
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/configrefs"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	"github.com/openshift/hypershift/api/v1beta1"
 	"github.com/openshift/hypershift/support/conversiontest"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1beta1/capi_types.go → api/hypershift/v1beta1/capi_types.go b/api/v1beta1/capi_types.go → api/hypershift/v1beta1/capi_types.go
diff --git a/api/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go b/api/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go
diff --git a/api/v1beta1/conversion.go → api/hypershift/v1beta1/conversion.go b/api/v1beta1/conversion.go → api/hypershift/v1beta1/conversion.go
diff --git a/api/v1beta1/doc.go → api/hypershift/v1beta1/doc.go b/api/v1beta1/doc.go → api/hypershift/v1beta1/doc.go
diff --git a/api/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go b/api/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go
diff --git a/api/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go
@@ -12,9 +12,17 @@ var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "hypershift.openshift.io", Version: "v1beta1"}
 
+	SchemeGroupVersion = GroupVersion
+
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+// Resource generated code relies on this being here, but it logically belongs to the group
+// DEPRECATED
+func Resource(resource string) schema.GroupResource {
+	return schema.GroupResource{Group: GroupVersion.Group, Resource: resource}
+}
diff --git a/api/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go b/api/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go
@@ -11,6 +11,7 @@ func init() {
 }
 
 // HostedControlPlane defines the desired state of HostedControlPlane
+// +genclient
 // +kubebuilder:resource:path=hostedcontrolplanes,shortName=hcp;hcps,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status

diff --git a/api/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go b/api/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go
diff --git a/api/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go b/api/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go
diff --git a/api/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go b/api/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go
diff --git a/api/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go b/api/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go
diff --git a/api/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go
diff --git a/api/scheme.go b/api/scheme.go
@@ -11,8 +11,8 @@ import (
 	routev1 "github.com/openshift/api/route/v1"
 	securityv1 "github.com/openshift/api/security/v1"
 	agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
-	hyperv1alpha1 "github.com/openshift/hypershift/api/v1alpha1"
-	hyperv1beta1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1alpha1 "github.com/openshift/hypershift/api/hypershift/v1alpha1"
+	hyperv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/support/rhobsmonitoring"
 	prometheusoperatorv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

diff --git a/api/util/configrefs/refs_test.go b/api/util/configrefs/refs_test.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	configv1 "github.com/openshift/api/config/v1"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 func TestKnownConfigMapRefs(t *testing.T) {

diff --git a/client/applyconfiguration/hypershift/v1alpha1/aescbcspec.go b/client/applyconfiguration/hypershift/v1alpha1/aescbcspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/agentnodepoolplatform.go b/client/applyconfiguration/hypershift/v1alpha1/agentnodepoolplatform.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/agentplatformspec.go b/client/applyconfiguration/hypershift/v1alpha1/agentplatformspec.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/apiendpoint.go b/client/applyconfiguration/hypershift/v1alpha1/apiendpoint.go
diff --git a/client/applyconfiguration/hypershift/v1alpha1/apiservernetworking.go b/client/applyconfiguration/hypershift/v1alpha1/apiservernetworking.go