Merge pull request #13 from NVIDIA/release-0.1

Minor fixes pro first release cut
NVIDIA · Feb 15, 2024 · 3957e15 · 3957e15
2 parents a7bd07b + d9a0722
commit 3957e15
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 26 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -5,9 +5,13 @@ name: Go
 
 on:
   push:
-    branches: [ "main" ]
+    branches: 
+      - main
+      - release-*
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - main
+      - release-*
 
 jobs:
 

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-.PHONY: build fmt verify
+.PHONY: build fmt verify release
 
 GO_CMD ?= go
 GO_FMT ?= gofmt
@@ -40,16 +40,26 @@ verify:
 	    exit 1; \
 	fi
 
+release:
+	@rm -rf bin
+	@mkdir -p bin
+	@for os in linux darwin; do \
+		for arch in amd64 arm64; do \
+			echo "Building $$os-$$arch"; \
+			GOOS=$$os GOARCH=$$arch $(GO_CMD) build -o bin/$(BINARY_NAME)-$$os-$$arch cmd/main.go; \
+		done; \
+	done
+
 .PHONY: generate
 generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on $(GO_CMD) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.1
+	@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on $(GO_CMD) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 
 # Generate manifests e.g. CRD, RBAC etc.
 .PHONY: manifests
 manifests: controller-gen
-	$(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="./..." output:crd:artifacts:config=config/crd/bases
diff --git a/api/holodeck/v1alpha1/types.go b/api/holodeck/v1alpha1/types.go
@@ -30,11 +30,11 @@ type EnvironmentSpec struct {
 	Instance `json:"instance"`
 
 	// +optional
-	NVDriver NVDriver `json:"nvDriver"`
+	NVIDIADriver NVIDIADriver `json:"nvidiaDriver"`
 	// +optional
 	ContainerRuntime ContainerRuntime `json:"containerRuntime"`
 	// +optional
-	NVContainerToolKit NVContainerToolKit `json:"nvContainerToolKit"`
+	NVIDIAContainerToolkit NVIDIAContainerToolkit `json:"nvidiaContainerToolkit"`
 	// +optional
 	Kubernetes Kubernetes `json:"kubernetes"`
 }
@@ -134,7 +134,7 @@ type Auth struct {
 	PrivateKey string `json:"privateKey"`
 }
 
-type NVDriver struct {
+type NVIDIADriver struct {
 	Install bool `json:"install"`
 	// If not set the latest stable version will be used
 	// +optional
@@ -189,7 +189,7 @@ type ExtraPortMapping struct {
 	HostPort      int `json:"hostPort"`
 }
 
-type NVContainerToolKit struct {
+type NVIDIAContainerToolkit struct {
 	Install bool `json:"install"`
 	// If not set the latest stable version will be used
 	// +optional

diff --git a/api/holodeck/v1alpha1/zz_generated.deepcopy.go b/api/holodeck/v1alpha1/zz_generated.deepcopy.go
diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pkg/provisioner/dependency.go b/pkg/provisioner/dependency.go
@@ -62,7 +62,7 @@ func buildDependencyGraph(env v1alpha1.Environment) ([]ProvisionFunc, error) {
 	}
 
 	// if container toolkit is enabled then add container toolkit and nvdriver to kubeadm
-	if env.Spec.NVContainerToolKit.Install {
+	if env.Spec.NVIDIAContainerToolkit.Install {
 		graph["kubeadm"] = append(graph["kubeadm"], "containerToolkit")
 		graph["kubeadm"] = append(graph["kubeadm"], "nvdriver")
 
@@ -81,7 +81,7 @@ func buildDependencyGraph(env v1alpha1.Environment) ([]ProvisionFunc, error) {
 		graph["containerToolkit"] = append(graph["containerToolkit"], "containerToolkit")
 
 		// user might request to install container toolkit without nvdriver for testing purpose
-		if env.Spec.NVDriver.Install {
+		if env.Spec.NVIDIADriver.Install {
 			graph["containerToolkit"] = append(graph["containerToolkit"], "nvdriver")
 		}
 	}
@@ -107,7 +107,7 @@ func buildDependencyGraph(env v1alpha1.Environment) ([]ProvisionFunc, error) {
 	}
 
 	// If no kubernetes is requested, we move to container-toolkit
-	if env.Spec.NVContainerToolKit.Install {
+	if env.Spec.NVIDIAContainerToolkit.Install {
 		for _, f := range graph["containerToolkit"] {
 			ordered = append(ordered, functions[f])
 		}
@@ -134,7 +134,7 @@ func buildDependencyGraph(env v1alpha1.Environment) ([]ProvisionFunc, error) {
 	}
 
 	// If no container-runtime is requested, we move to nvdriver
-	if env.Spec.NVDriver.Install {
+	if env.Spec.NVIDIADriver.Install {
 		ordered = append(ordered, functions["nvdriver"])
 		return ordered, nil
 	}