Fix clientset generation and add for informers and listers (#275)

* fix generate-client Makefile target

* add SchemeGroupVersion var in v1alpha2 package

* add Resource function in v1alpha1 and v1alpha2 packages

* add +genclient directive in all APIs

* generate clientset, informers, and listers

Makefile

@@ -55,19 +55,15 @@ manifests: controller-gen addlicense ## Generate WebhookConfiguration, ClusterRo
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
-PROJECT_PACKAGE ?= $(shell go list -m)
 .PHONY: generate-client
 generate-client:  ## Generate client
-	@rm -r pkg/clientset || echo -n
+	@rm -r pkg/clientset pkg/informers pkg/listers || echo -n
 	$(CONTAINER_TOOL) run -i --rm \
-		-v $(PWD):/go/src/$(PROJECT_PACKAGE) \
-		-e PROJECT_PACKAGE=$(PROJECT_PACKAGE) \
-		-e CLIENT_GENERATOR_OUT=$(PROJECT_PACKAGE)/pkg \
-		-e APIS_ROOT=$(PROJECT_PACKAGE)/api \
-		-e GROUPS_VERSION="zora:v1alpha1" \
-		-e GENERATION_TARGETS="client" \
-		-e BOILERPLATE_PATH="hack/boilerplate.go.txt" \
-		ghcr.io/slok/kube-code-generator:v0.1.0
+		-v $(PWD):/app \
+		ghcr.io/slok/kube-code-generator:v0.1.0 \
+		--apis-in ./api \
+		--go-gen-out ./pkg \
+		--debug
 
 .PHONY: generate-helm-docs
 generate-helm-docs: helm-docs ## Generate documentation for helm chart.

api/zora/v1alpha1/cluster_types.go

@@ -92,8 +92,6 @@ func (in *ClusterStatus) SetResources(res discovery.ClusterResources) {
 
 // Cluster is the Schema for the clusters API
 // +genclient
-// +genclient:onlyVerbs=list,get
-// +genclient:noStatus
 type Cluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha1/clusterissue_types.go

@@ -81,7 +81,6 @@ type ClusterIssueStatus struct {
 
 // ClusterIssue is the Schema for the clusterissues API
 // +genclient
-// +genclient:noStatus
 type ClusterIssue struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha1/clusterscan_types.go

@@ -273,8 +273,6 @@ type PluginScanStatus struct {
 
 // ClusterScan is the Schema for the clusterscans API
 // +genclient
-// +genclient:onlyVerbs=list,get
-// +genclient:noStatus
 type ClusterScan struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha1/customcheck_types.go

@@ -53,6 +53,7 @@ type CustomCheckStatus struct {
 //+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",priority=0
 
 // CustomCheck is the Schema for the customchecks API
+// +genclient
 type CustomCheck struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha1/groupversion_info.go

@@ -35,3 +35,8 @@ var (
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}

api/zora/v1alpha1/plugin_types.go

@@ -106,6 +106,7 @@ type PluginStatus struct {
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Plugin is the Schema for the plugins API
+// +genclient
 type Plugin struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha1/vulnerabilityreport_types.go

@@ -100,7 +100,6 @@ func (in *VulnerabilityReport) SaaSStatusIsTrue() bool {
 
 // VulnerabilityReport is the Schema for the vulnerabilityreports API
 // +genclient
-// +genclient:noStatus
 type VulnerabilityReport struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha2/customcheck_types.go

@@ -46,6 +46,7 @@ type CustomCheckStatus struct {
 //+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",priority=0
 
 // CustomCheck is the Schema for the customchecks API
+// +genclient
 type CustomCheck struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/zora/v1alpha2/groupversion_info.go

@@ -26,9 +26,17 @@ var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "zora.undistro.io", Version: "v1alpha2"}
 
+	// SchemeGroupVersion is a copy of GroupVersion, used by client-gen
+	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 takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}