Merge pull request #25 from NVIDIA/add_clientsets

Add clientsets for NIM operator APIs

Author: ArangoGutierrez

.github/dependabot.yml

@@ -42,3 +42,10 @@ updates:
     directory: "/deployments/devel"
     schedule:
       interval: "daily"
+
+  - package-ecosystem: "gomod"
+    target-branch: main
+    directory: "tools/"
+    schedule:
+      interval: "weekly"
+      day: "sunday"

Makefile

@@ -17,6 +17,9 @@ IMG ?= nvcr.io/nvidia/cloud-native/nim-operator:v0.1.0
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.30.0
 
+GO_CMD ?= go
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+
 # Import versions
 include $(CURDIR)/versions.mk
 
@@ -33,6 +36,8 @@ endif
 # tools. (i.e. podman)
 CONTAINER_TOOL ?= docker
 
+CLIENT_GEN = $(shell pwd)/bin/client-gen
+
 # DEFAULT_CHANNEL defines the default channel used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable")
 # To re-generate a bundle for any other default channel without changing the default setup, you can:
@@ -82,6 +87,19 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
+.PHONY: generate-clientset
+generate-clientset: install-tools
+	$(CLIENT_GEN) --go-header-file=$(CURDIR)/hack/boilerplate.go.txt \
+		--clientset-name "versioned" \
+		--output-dir $(CURDIR)/api \
+		--output-pkg $(MODULE)/api \
+		--input-base $(CURDIR)/api \
+		--input "apps/v1alpha1"
+
+validate-generated-assets: manifests generate generate-clientset
+	@echo "- Verifying that the generated code and manifests are in-sync..."
+	@git diff --exit-code -- api config
+
 .PHONY: fmt
 fmt: ## Run go fmt against code.
 	go fmt ./...
@@ -171,6 +189,11 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
+install-tools:
+	@echo Installing tools from tools.go
+	export GOBIN=$(PROJECT_DIR)/bin && \
+	grep '^\s*_' tools/tools.go | awk '{print $$2}' | xargs -tI % $(GO_CMD) install -mod=readonly -modfile=tools/go.mod %
+
 ##@ Dependencies
 
 ## Location to install dependencies to

PROJECT

@@ -15,7 +15,7 @@ resources:
   domain: nvidia.com
   group: apps
   kind: NIMService
-  path: github.com/NVIDIA/k8s-nim-operator/api/v1alpha1
+  path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -24,7 +24,7 @@ resources:
   domain: nvidia.com
   group: apps
   kind: NIMCache
-  path: github.com/NVIDIA/k8s-nim-operator/api/v1alpha1
+  path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -33,6 +33,6 @@ resources:
   domain: nvidia.com
   group: apps
   kind: NIMPipeline
-  path: github.com/NVIDIA/k8s-nim-operator/api/v1alpha1
+  path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
   version: v1alpha1
 version: "3"

api/v1alpha1/common_types.go renamed to api/apps/v1alpha1/common_types.go

@@ -25,11 +25,11 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "apps.nvidia.com", Version: "v1alpha1"}
+	// SchemeGroupVersion is group version used to register these objects
+	SchemeGroupVersion = schema.GroupVersion{Group: "apps.nvidia.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme

api/v1alpha1/groupversion_info.go renamed to api/apps/v1alpha1/groupversion_info.go

@@ -211,6 +211,7 @@ func (s *NIMSource) EnvFromSecrets() []v1.EnvFromSource {
 	return []corev1.EnvFromSource{}
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.state`,priority=0

api/v1alpha1/nimcache_types.go renamed to api/apps/v1alpha1/nimcache_types.go

@@ -47,6 +47,7 @@ type NIMPipelineStatus struct {
 	State      string             `json:"state,omitempty"`
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

api/v1alpha1/nimpipeline_types.go renamed to api/apps/v1alpha1/nimpipeline_types.go

@@ -90,6 +90,7 @@ type NIMServiceStatus struct {
 	State             string             `json:"state,omitempty"`
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.state`,priority=0