Merge release v0.1.14

Release v0.1.14
NearNodeFlash · Sep 16, 2024 · 392093f · 392093f
2 parents de0dacc + 0b6b888
commit 392093f
Show file tree

Hide file tree

Showing 203 changed files with 39,499 additions and 1,064 deletions.
diff --git a/CRD_VERSIONING.md b/CRD_VERSIONING.md
@@ -0,0 +1,5 @@
+# CRD Versioning
+
+See Kubebuilder's [Tutorial: Multi-Version API](https://book.kubebuilder.io/multiversion-tutorial/tutorial) for a description of the mechanism. For more detail read the Kubernetes document [Versions in CustomResourceDefinitions](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definition-versioning/).
+
+This repository uses [crd-bumper](https://github.com/NearNodeFlash/nnf-deploy/tree/master/tools/crd-bumper#readme) to handle CRD versioning.
diff --git a/Dockerfile b/Dockerfile
@@ -49,7 +49,6 @@ WORKDIR /workspace
 
 ARG FAILFAST
 COPY hack/ hack/
-COPY test-tools.sh .
 COPY Makefile .
 
 RUN echo "building test target after copy" && pwd && ls -al

diff --git a/Makefile b/Makefile
@@ -222,17 +222,20 @@ TESTDIRS ?= internal api github/cluster-api
 FAILFAST ?= no
 test: manifests generate fmt vet envtest ## Run tests.
 	find internal -name "*.db" -type d -exec rm -rf {} +
-	source test-tools.sh; prefix_webhook_names config/webhook ${ENVTEST_ASSETS_DIR}/webhook
+	./hack/prefix-webhook-names.sh config/webhook ${ENVTEST_ASSETS_DIR}/webhook-nnf nnf
+	./hack/prefix-webhook-names.sh vendor/github.com/NearNodeFlash/lustre-fs-operator/config/webhook ${ENVTEST_ASSETS_DIR}/webhook-lus lus
+	./hack/prefix-webhook-names.sh vendor/github.com/DataWorkflowServices/dws/config/webhook ${ENVTEST_ASSETS_DIR}/webhook-dws dws
 	if [[ "${FAILFAST}" == yes ]]; then \
 		failfast="-ginkgo.fail-fast"; \
 	fi; \
 	set -o errexit; \
 	export GOMEGA_DEFAULT_EVENTUALLY_TIMEOUT=${EVENTUALLY_TIMEOUT}; \
 	export GOMEGA_DEFAULT_EVENTUALLY_INTERVAL=${EVENTUALLY_INTERVAL}; \
-	export WEBHOOK_DIR=${ENVTEST_ASSETS_DIR}/webhook; \
+	export WEBHOOK_DIRS=${ENVTEST_ASSETS_DIR}/webhook-nnf:${ENVTEST_ASSETS_DIR}/webhook-lus:${ENVTEST_ASSETS_DIR}/webhook-dws; \
 	for subdir in ${TESTDIRS}; do \
 		KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" go test -v ./$$subdir/... -coverprofile cover-$$(basename $$subdir.out) -ginkgo.v $$failfast; \
-	done
+	done; \
+	rm -rf internal/controller/nnf.db
 
 ##@ Build
 RPM_PLATFORM ?= linux/amd64

diff --git a/PROJECT b/PROJECT
@@ -62,23 +62,24 @@ resources:
     namespaced: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfJobStorageInstance
+  kind: NnfDataMovement
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfDataMovement
+  kind: NnfDataMovementManager
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
+  controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfDataMovementManager
+  kind: NnfAccess
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
@@ -87,23 +88,24 @@ resources:
   controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfAccess
+  kind: NnfStorageProfile
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
+  controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfPersistentStorageInstance
+  kind: NnfNodeECData
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfDataMovementWorkflow
+  kind: NnfContainerProfile
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
@@ -112,68 +114,187 @@ resources:
   controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfStorageProfile
+  kind: NnfPortManager
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
-  webhooks:
-    validation: true
-    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfNodeECData
+  kind: NnfLustreMGT
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfContainerProfile
+  kind: NnfDataMovementProfile
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
-  webhooks:
-    validation: true
-    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfPortManager
+  kind: NnfSystemStorage
   path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
-  controller: true
   domain: cray.hpe.com
   group: nnf
-  kind: NnfLustreMGT
-  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
-  version: v1alpha1
+  kind: NnfAccess
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfContainerProfile
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfDataMovement
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfDataMovementManager
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
   domain: cray.hpe.com
   group: nnf
   kind: NnfDataMovementProfile
-  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
-  version: v1alpha1
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfLustreMGT
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfNode
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfNodeBlockStorage
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfNodeECData
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfNodeStorage
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfPortManager
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfStorage
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cray.hpe.com
+  group: nnf
+  kind: NnfStorageProfile
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
   webhooks:
     validation: true
     webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
-  controller: true
   domain: cray.hpe.com
   group: nnf
   kind: NnfSystemStorage
-  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha1
-  version: v1alpha1
+  path: github.com/NearNodeFlash/nnf-sos/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 version: "3"