Add Make target to sync CRDS and remove profiles printcolumn as it is… (

#42) * Add Make target to sync CRDS and remove profiles printcolumn as it is now a map Signed-off-by: Shiva Krishna, Merla <[email protected]> * Generate manifests before sync Signed-off-by: Shiva Krishna, Merla <[email protected]> * Add to validation target Add validation step in the CI pipeline for generated assets Signed-off-by: Shiva Krishna, Merla <[email protected]> --------- Signed-off-by: Shiva Krishna, Merla <[email protected]>
NVIDIA · Aug 9, 2024 · 6a22a05 · 6a22a05
1 parent 4844f6f
commit 6a22a05
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml
@@ -50,6 +50,8 @@ jobs:
         skip-cache: true
     - name: Check golang modules
       run: make check-vendor
+    - name: Check generated assets
+      run: make validate-generated-assets
   test:
     name: Unit test
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -96,7 +96,7 @@ generate-clientset: install-tools
 		--input-base $(CURDIR)/api \
 		--input "apps/v1alpha1"
 
-validate-generated-assets: manifests generate generate-clientset
+validate-generated-assets: manifests generate generate-clientset sync-crds
 	@echo "- Verifying that the generated code and manifests are in-sync..."
 	@git diff --exit-code -- api config
 
@@ -189,11 +189,18 @@ 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 -
 
+.PHONY: install-tools
 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 %
 
+.PHONY: sync-crds
+sync-crds: manifests
+	@echo Syncing CRDs into Helm and OLM packages
+	cp $(PROJECT_DIR)/config/crd/bases/* deployments/helm/k8s-nim-operator/crds
+	cp $(PROJECT_DIR)/config/crd/bases/* bundle/manifests
+
 ##@ Dependencies
 
 ## Location to install dependencies to

diff --git a/api/apps/v1alpha1/nimcache_types.go b/api/apps/v1alpha1/nimcache_types.go
@@ -217,7 +217,6 @@ func (s *NIMSource) EnvFromSecrets() []v1.EnvFromSource {
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.state`,priority=0
 // +kubebuilder:printcolumn:name="PVC",type=string,JSONPath=`.status.pvc`,priority=0
-// +kubebuilder:printcolumn:name="Profiles",type=string,JSONPath=`.status.profiles`,priority=1
 // +kubebuilder:printcolumn:name="Age",type=string,JSONPath=`.metadata.creationTimestamp`,priority=0
 
 // NIMCache is the Schema for the nimcaches API

diff --git a/bundle/manifests/apps.nvidia.com_nimcaches.yaml b/bundle/manifests/apps.nvidia.com_nimcaches.yaml
@@ -21,10 +21,6 @@ spec:
     - jsonPath: .status.pvc
       name: PVC
       type: string
-    - jsonPath: .status.profiles
-      name: Profiles
-      priority: 1
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: string

diff --git a/config/crd/bases/apps.nvidia.com_nimcaches.yaml b/config/crd/bases/apps.nvidia.com_nimcaches.yaml
@@ -21,10 +21,6 @@ spec:
     - jsonPath: .status.pvc
       name: PVC
       type: string
-    - jsonPath: .status.profiles
-      name: Profiles
-      priority: 1
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: string

diff --git a/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimcaches.yaml b/deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimcaches.yaml
@@ -21,10 +21,6 @@ spec:
     - jsonPath: .status.pvc
       name: PVC
       type: string
-    - jsonPath: .status.profiles
-      name: Profiles
-      priority: 1
-      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: string
@@ -266,7 +262,6 @@ spec:
                   type: object
                 type: array
             required:
-            - resources
             - source
             - storage
             type: object