Merge branch 'master' into bug/deploy-fix-tds

NearNodeFlash · Oct 31, 2023 · 11eec47 · 11eec47
2 parents d613450 + 3c49e3c
commit 11eec47
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,16 @@
 all: fmt vet nnf-deploy
 
-nnf-deploy: main.go
-	go build
+nnf-deploy: cmd/main.go
+	go build -o ./nnf-deploy cmd/main.go
 
 .PHONY: fmt
 fmt:
-	go fmt ./main.go
+	go fmt cmd/main.go
 	go fmt ./config/*.go
 
 .PHONY: vet
 vet:
-	go vet ./main.go
+	go vet cmd/main.go
 
 .PHONY: test
 test:

diff --git a/main.go → cmd/main.go b/main.go → cmd/main.go
diff --git a/dws b/dws
diff --git a/lustre-fs-operator b/lustre-fs-operator
diff --git a/nnf-dm b/nnf-dm
diff --git a/nnf-integration-test b/nnf-integration-test
diff --git a/nnf-sos b/nnf-sos
+1 −0		.gitignore
+4 −3		Dockerfile
+10 −9		Makefile
+1 −1		PROJECT
+0 −1		api/v1alpha1/zz_generated.deepcopy.go
+2 −2		api/v1alpha2/webhook_suite_test.go
+0 −1		api/v1alpha2/zz_generated.deepcopy.go
+0 −0		cmd/main.go
+1 −1		config/craystack/kustomization.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_computes.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_servers.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_storages.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml
+1 −1		config/crd/bases/dataworkflowservices.github.io_workflows.yaml
+1 −1		config/csm/kustomization.yaml
+99 −29		config/default/kustomization.yaml
+1 −1		config/default/manager_auth_proxy_patch.yaml
+1 −1		config/dp0/kustomization.yaml
+1 −1		config/kind/kustomization.yaml
+1 −1		config/manager/kustomization.yaml
+1 −1		controllers/workflow_controller.go
+3 −3		github/cluster-api/util/conversion/conversion_test.go
+42 −0		hack/make-kustomization.sh
+1 −1		internal/controller/conversion_test.go
+0 −0		internal/controller/metrics/metrics.go
+5 −4		internal/controller/suite_test.go
+1 −1		internal/controller/workflow_controller_test.go
+0 −1		utils/dwdparse/zz_generated.deepcopy.go
+1 −0		.gitignore
+21 −3		Dockerfile
+13 −12		Makefile
+1 −1		PROJECT
+0 −1		api/v1alpha1/zz_generated.deepcopy.go
+2 −2		api/v1beta1/webhook_suite_test.go
+0 −1		api/v1beta1/zz_generated.deepcopy.go
+1 −1		cmd/main.go
+1 −1		config/crd/bases/lus.cray.hpe.com_lustrefilesystems.yaml
+99 −29		config/default/kustomization.yaml
+1 −1		config/default/manager_auth_proxy_patch.yaml
+3 −3		github/cluster-api/util/conversion/conversion_test.go
+1 −1		go.mod
+2 −2		go.sum
+42 −0		hack/make-kustomization.sh
+1 −1		internal/controller/conversion_test.go
+1 −1		internal/controller/lustrefilesystem_controller.go
+1 −1		internal/controller/lustrefilesystem_controller_test.go
+3 −3		internal/controller/suite_test.go
+1 −1		vendor/modules.txt
+67 −0		.github/workflows/helper-image.yaml
+2 −0		.gitignore
+20 −0		.vscode/launch.json
+3 −0		Makefile
+4 −4		go.mod
+8 −8		go.sum
+7 −0		helper_image/Dockerfile
+45 −0		helper_image/Makefile
+5 −0		helper_image/README.md
+66 −0		helper_image/scripts/copy-in.sh
+48 −0		helper_image/scripts/copy-out.sh
+4 −0		helper_image/scripts/default.sh
+15 −17		int_test.go
+8 −0		internal/internal.go
+43 −0		internal/options.go
+13 −9		internal/states.go
+143 −0		internal/utils.go