Merge pull request #3448 from stevekuznetsov/skuznets/rename-cert-gv

HOSTEDCP-1344: api: move CSRA to a new group
openshift · Jan 24, 2024 · 6c84753 · 6c84753
2 parents 9b08dcf + 281ec93
commit 6c84753
Show file tree

Hide file tree

Showing 42 changed files with 887 additions and 577 deletions.
diff --git a/Makefile b/Makefile
@@ -94,9 +94,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/hypershift/..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 	rm -rf cmd/install/assets/hypershift-operator/*.yaml
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/hypershift/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
 
 .PHONY: cluster-api
 cluster-api: $(CONTROLLER_GEN)

diff --git a/api/certificates/register.go b/api/certificates/register.go
@@ -0,0 +1,3 @@
+package certificates
+
+const GroupName = "certificates.hypershift.openshift.io"
diff --git a/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go b/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go
@@ -1,14 +1,9 @@
-package v1beta1
+package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func init() {
-	SchemeBuilder.Register(&CertificateSigningRequestApproval{})
-	SchemeBuilder.Register(&CertificateSigningRequestApprovalList{})
-}
-
 // +genclient
 // +kubebuilder:resource:path=certificatesigningrequestapprovals,shortName=csra;csras,scope=Namespaced
 // +kubebuilder:object:root=true

diff --git a/api/certificates/v1alpha1/doc.go b/api/certificates/v1alpha1/doc.go
@@ -0,0 +1,4 @@
+// +k8s:deepcopy-gen=package,register
+// +groupName=certificates.hypershift.openshift.io
+// +k8s:openapi-gen=true
+package v1alpha1
diff --git a/api/certificates/v1alpha1/register.go b/api/certificates/v1alpha1/register.go
@@ -0,0 +1,37 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/openshift/hypershift/api/certificates"
+)
+
+// SchemeGroupVersion is group version used to register these objects.
+var SchemeGroupVersion = schema.GroupVersion{Group: certificates.GroupName, Version: "v1alpha1"}
+
+// Kind takes an unqualified kind and returns back a Group qualified GroupKind.
+func Kind(kind string) schema.GroupKind {
+	return SchemeGroupVersion.WithKind(kind).GroupKind()
+}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource.
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+// Adds the list of known types to Scheme.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&CertificateSigningRequestApproval{},
+		&CertificateSigningRequestApprovalList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
diff --git a/api/certificates/v1alpha1/zz_generated.deepcopy.go b/api/certificates/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/hypershift/v1beta1/zz_generated.deepcopy.go b/api/hypershift/v1beta1/zz_generated.deepcopy.go
diff --git a/...eta1/certificatesigningrequestapproval.go → ...pha1/certificatesigningrequestapproval.go b/...eta1/certificatesigningrequestapproval.go → ...pha1/certificatesigningrequestapproval.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package certificates

		const GroupName = "certificates.hypershift.openshift.io"