Bump controllergen to v0.14

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
NVIDIA · Feb 15, 2024 · 5e006c7 · 5e006c7
1 parent fb86a83
commit 5e006c7
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 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
@@ -47,7 +47,7 @@ generate: controller-gen
 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

diff --git a/api/holodeck/v1alpha1/types.go b/api/holodeck/v1alpha1/types.go
@@ -189,7 +189,7 @@ type ExtraPortMapping struct {
 	HostPort      int `json:"hostPort"`
 }
 
-type NVContainerToolKit struct {
+type NVContainerToolkit 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/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.NVContainerToolkit.Install {
 		graph["kubeadm"] = append(graph["kubeadm"], "containerToolkit")
 		graph["kubeadm"] = append(graph["kubeadm"], "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.NVContainerToolkit.Install {
 		for _, f := range graph["containerToolkit"] {
 			ordered = append(ordered, functions[f])
 		}