Merge pull request #24 from alphagov/BAU-Deprecate-scheme-builder

BAU - Deprecate scheme builder

Author: nimalank7

api/v1/groupversion_info.go

@@ -20,8 +20,9 @@ limitations under the License.
 package v1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
@@ -33,8 +34,21 @@ var (
 	GroupVersion = SchemeGroupVersion
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	// Add your API types here
+	scheme.AddKnownTypes(GroupVersion,
+		&JobRequest{},
+		&JobRequestList{},
+		&JobRequestReview{},
+		&JobRequestReviewList{},
+	)
+
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

api/v1/jobrequest_types.go

@@ -87,7 +87,3 @@ type JobRequestList struct {
 	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []JobRequest `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&JobRequest{}, &JobRequestList{})
-}

api/v1/jobrequestreview_types.go

@@ -66,7 +66,3 @@ type JobRequestReviewList struct {
 	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []JobRequestReview `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&JobRequestReview{}, &JobRequestReviewList{})
-}

api/v1/zz_generated.deepcopy.go

@@ -3,6 +3,7 @@
 # It should be run by config/default
 resources:
 - bases/platform.publishing.service.gov.uk_jobrequests.yaml
+- bases/platform.publishing.service.gov.uk_jobrequestreviews.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patches:

config/crd/kustomization.yaml

@@ -7,6 +7,7 @@ rules:
 - apiGroups:
   - platform.publishing.service.gov.uk
   resources:
+  - jobrequestreviews
   - jobrequests
   verbs:
   - create
@@ -19,12 +20,14 @@ rules:
 - apiGroups:
   - platform.publishing.service.gov.uk
   resources:
+  - jobrequestreviews/finalizers
   - jobrequests/finalizers
   verbs:
   - update
 - apiGroups:
   - platform.publishing.service.gov.uk
   resources:
+  - jobrequestreviews/status
   - jobrequests/status
   verbs:
   - get