fix script to generate client, listers, informets (#30)

* fix script to generate client, listers, informets

Signed-off-by: DavidSpek <[email protected]>

* generate client when running make generate

Signed-off-by: DavidSpek <[email protected]>

* fix running command for first time

Signed-off-by: DavidSpek <[email protected]>

* don't run client generate at when running regular generate

Signed-off-by: DavidSpek <[email protected]>

* fix generate command

Signed-off-by: DavidSpek <[email protected]>

Signed-off-by: DavidSpek <[email protected]>

Makefile

@@ -32,10 +32,10 @@ help: ## Display this help.
 ##@ Development
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/..." output:crd:artifacts:config=config/crd/bases
 
-generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+generate: controller-gen generate-client ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations and the clientset, informers and listers.
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./apis/..."
 
 fmt: ## Run go fmt against code.
 	go fmt ./...
@@ -81,6 +81,19 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/default | kubectl delete -f -
 
+run-client-gen: client-gen
+	$(CLIENT_GEN) --clientset-name versioned --input-base github.com/pluralsh/plural-operator/apis --input platform/v1alpha1,vpn/v1alpha1 --output-package github.com/pluralsh/plural-operator/generated/client/clientset --go-header-file hack/boilerplate.go.txt
+
+run-lister-gen: lister-gen
+	$(LISTER_GEN) --input-dirs github.com/pluralsh/plural-operator/apis/platform/v1alpha1,github.com/pluralsh/plural-operator/apis/vpn/v1alpha1 --output-package github.com/pluralsh/plural-operator/generated/client/listers --go-header-file hack/boilerplate.go.txt
+
+run-informer-gen: informer-gen
+	$(INFORMER_GEN) --input-dirs github.com/pluralsh/plural-operator/apis/platform/v1alpha1,github.com/pluralsh/plural-operator/apis/vpn/v1alpha1  --versioned-clientset-package github.com/pluralsh/plural-operator/generated/client/clientset/versioned --listers-package github.com/pluralsh/plural-operator/generated/client/listers --output-package github.com/pluralsh/plural-operator/generated/client/informers --go-header-file hack/boilerplate.go.txt
+
+generate-client: run-client-gen run-lister-gen run-informer-gen
+	rm -rf generated
+	mv github.com/pluralsh/plural-operator/generated generated
+	rm -rf github.com
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
@@ -90,10 +103,25 @@ KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
 
-client-gen:
-	./hack/update-codegen.sh
-	mv github.com/pluralsh/plural-operator/generated generated
-	rm -rf github.com
+CLIENT_GEN = $(shell pwd)/bin/client-gen
+client-gen: ## Download client-gen locally if necessary.
+	$(call go-get-tool,$(CLIENT_GEN),k8s.io/code-generator/cmd/[email protected])
+
+LISTER_GEN = $(shell pwd)/bin/lister-gen
+lister-gen: ## Download lister-gen locally if necessary.
+	$(call go-get-tool,$(LISTER_GEN),k8s.io/code-generator/cmd/[email protected])
+
+INFORMER_GEN = $(shell pwd)/bin/informer-gen
+informer-gen: ## Download informer-gen locally if necessary.
+	$(call go-get-tool,$(INFORMER_GEN),k8s.io/code-generator/cmd/[email protected])
+
+DEFFAULTER_GEN = $(shell pwd)/bin/defaulter-gen
+defaulter-gen: ## Download defaulter-gen locally if necessary.
+	$(call go-get-tool,$(DEFFAULTER_GEN),k8s.io/code-generator/cmd/[email protected])
+
+DEEPCOPY_GEN = $(shell pwd)/bin/deepcopy-gen
+deepcopy-gen: ## Download deepcopy-gen locally if necessary.
+	$(call go-get-tool,$(DEEPCOPY_GEN),k8s.io/code-generator/cmd/[email protected])
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

apis/platform/v1alpha1/configurationoverlay_types.go

@@ -72,6 +72,7 @@ type ConfigurationOverlayStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/platform/v1alpha1/defaultstorageclass_types.go

@@ -31,6 +31,7 @@ type DefaultStorageClassStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:scope=Cluster

apis/platform/v1alpha1/license_types.go

@@ -63,6 +63,7 @@ type LicenseStatus struct {
 	Secrets map[string]string `json:"secrets"`
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/platform/v1alpha1/registrycredential_types.go

@@ -2,6 +2,7 @@ package v1alpha1
 
 import (
 	"fmt"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -36,6 +37,7 @@ type RegistryCredentialStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/platform/v1alpha1/resourcegroup_types.go

@@ -33,6 +33,7 @@ type ResourceGroupStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:scope=Cluster

apis/platform/v1alpha1/runbook_types.go

@@ -194,6 +194,7 @@ type RunbookStatus struct {
 	Alerts []*RunbookAlertStatus `json:"alerts"`
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/platform/v1alpha1/secretsync_types.go

@@ -40,6 +40,7 @@ type SecretSyncStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/platform/v1alpha1/statefulsetresize_types.go

@@ -43,6 +43,7 @@ type StatefulSetResizeStatus struct {
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/vpn/v1alpha1/doc.go

@@ -0,0 +1,3 @@
+// +groupName=vpn.plural.sh
+
+package v1alpha1

apis/vpn/v1alpha1/register.go

@@ -0,0 +1,12 @@
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// SchemeGroupVersion is group version used to register these objects.
+var SchemeGroupVersion = GroupVersion
+
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}

apis/vpn/v1alpha1/wireguardpeer_types.go

@@ -84,6 +84,7 @@ type WireguardPeerStatus struct {
 	Conditions crhelperTypes.Conditions `json:"conditions,omitempty"`
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Wireguard Server",type="string",JSONPath=".spec.wireguardRef",description="The Wireguard Server this peer belongs to"

apis/vpn/v1alpha1/wireguardserver_types.go

@@ -125,6 +125,7 @@ type WireguardServerStatus struct {
 	Conditions crhelperTypes.Conditions `json:"conditions,omitempty"`
 }
 
+//+genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Hostname",type="string",JSONPath=".status.hostname",description="WireguardServer hostname"