Merge pull request #3463 from stevekuznetsov/skuznets/re-revert-api-diff

HOSTEDCP-1344: re-revert api stuff

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)

api/certificates/register.go

@@ -0,0 +1,3 @@
+package certificates
+
+const GroupName = "certificates.hypershift.openshift.io"

api/certificates/v1alpha1/certificatesigningrequestapproval_types.go

@@ -0,0 +1,34 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +kubebuilder:resource:path=certificatesigningrequestapprovals,shortName=csra;csras,scope=Namespaced
+// +kubebuilder:object:root=true
+// +kubebuilder:storageversion
+
+// CertificateSigningRequestApproval defines the desired state of CertificateSigningRequestApproval
+type CertificateSigningRequestApproval struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   CertificateSigningRequestApprovalSpec   `json:"spec,omitempty"`
+	Status CertificateSigningRequestApprovalStatus `json:"status,omitempty"`
+}
+
+// CertificateSigningRequestApprovalSpec defines the desired state of CertificateSigningRequestApproval
+type CertificateSigningRequestApprovalSpec struct{}
+
+// CertificateSigningRequestApprovalStatus defines the observed state of CertificateSigningRequestApproval
+type CertificateSigningRequestApprovalStatus struct{}
+
+// +kubebuilder:object:root=true
+
+// CertificateSigningRequestApprovalList contains a list of CertificateSigningRequestApprovals.
+type CertificateSigningRequestApprovalList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CertificateSigningRequestApproval `json:"items"`
+}

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

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
+}

api/hypershift/v1beta1/certificatesigningrequestapproval_types.go

@@ -4,11 +4,6 @@ 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