Merge pull request #3460 from stbenjam/revert-3448-1706107197301

TRT-1456: Revert #3448 "api: move CSRA to a new group"
openshift · Jan 24, 2024 · d7b8d75 · d7b8d75
2 parents 6c84753 + f061078
commit d7b8d75
Show file tree

Hide file tree

Showing 42 changed files with 577 additions and 887 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/..."
+	$(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)

diff --git a/api/certificates/register.go b/api/certificates/register.go
diff --git a/api/certificates/v1alpha1/doc.go b/api/certificates/v1alpha1/doc.go
diff --git a/api/certificates/v1alpha1/register.go b/api/certificates/v1alpha1/register.go
diff --git a/api/certificates/v1alpha1/zz_generated.deepcopy.go b/api/certificates/v1alpha1/zz_generated.deepcopy.go
diff --git a/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go b/...ertificatesigningrequestapproval_types.go → ...ertificatesigningrequestapproval_types.go
@@ -1,9 +1,14 @@
-package v1alpha1
+package v1beta1
 
 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/hypershift/v1beta1/zz_generated.deepcopy.go b/api/hypershift/v1beta1/zz_generated.deepcopy.go
diff --git a/...pha1/certificatesigningrequestapproval.go → ...eta1/certificatesigningrequestapproval.go b/...pha1/certificatesigningrequestapproval.go → ...eta1/certificatesigningrequestapproval.go