Merge pull request #1338 from mythi/PR-2023-011

tkatila · web-flow · commit fd67c5cd6fd4 · 2023-02-22T13:23:01.000+02:00
deployment fixes
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ BUILDER ?= "docker"
 EXTRA_BUILD_ARGS ?= ""
 
 CERT_MANAGER_VERSION ?= v1.11.0
-CONTROLLER_GEN_VERSION ?= v0.11.1
+CONTROLLER_GEN_VERSION ?= v0.11.3
 GOLANGCI_LINT_VERSION ?= v1.50.1
 KIND_VERSION ?= v0.17.0
 GOLICENSES_VERSION ?= v1.6.0
diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: acceleratorfunctions.fpga.intel.com
 spec:
diff --git a/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/fpga_admissionwebhook/crd/bases/fpga.intel.com_fpgaregions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: fpgaregions.fpga.intel.com
 spec:
diff --git a/deployments/fpga_plugin/base/kustomization.yaml b/deployments/fpga_plugin/base/kustomization.yaml
@@ -2,3 +2,4 @@ resources:
   - role.yaml
   - role_binding.yaml
   - intel-fpga-plugin-daemonset.yaml
+  - namespace.yaml
diff --git a/deployments/fpga_plugin/base/namespace.yaml b/deployments/fpga_plugin/base/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: system
diff --git a/deployments/fpga_plugin/overlays/af/kustomization.yaml b/deployments/fpga_plugin/overlays/af/kustomization.yaml
@@ -1,6 +1,6 @@
 namespace: intelfpgaplugin-system
 namePrefix: intelfpgaplugin-
 
-bases:
+resources:
   - ../../base
   - ../../../fpga_admissionwebhook/base
diff --git a/deployments/fpga_plugin/overlays/region/kustomization.yaml b/deployments/fpga_plugin/overlays/region/kustomization.yaml
@@ -1,7 +1,7 @@
 namespace: intelfpgaplugin-system
 namePrefix: intelfpgaplugin-
 
-bases:
+resources:
   - ../../base
   - ../../../fpga_admissionwebhook/base
 
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dlbdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: dlbdeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_dsadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: dsadeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_fpgadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: fpgadeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_gpudeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: gpudeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_iaadeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: iaadeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_qatdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: qatdeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml b/deployments/operator/crd/bases/deviceplugin.intel.com_sgxdeviceplugins.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: sgxdeviceplugins.deviceplugin.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml b/deployments/operator/crd/bases/fpga.intel.com_acceleratorfunctions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: acceleratorfunctions.fpga.intel.com
 spec:
diff --git a/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml b/deployments/operator/crd/bases/fpga.intel.com_fpgaregions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.11.3
   creationTimestamp: null
   name: fpgaregions.fpga.intel.com
 spec:
diff --git a/deployments/operator/rbac/fpgadeviceplugin_editor_role.yaml b/deployments/operator/rbac/fpgadeviceplugin_editor_role.yaml
diff --git a/deployments/operator/rbac/fpgadeviceplugin_viewer_role.yaml b/deployments/operator/rbac/fpgadeviceplugin_viewer_role.yaml
diff --git a/deployments/operator/rbac/gpudeviceplugin_editor_role.yaml b/deployments/operator/rbac/gpudeviceplugin_editor_role.yaml
diff --git a/deployments/operator/rbac/gpudeviceplugin_viewer_role.yaml b/deployments/operator/rbac/gpudeviceplugin_viewer_role.yaml
diff --git a/deployments/operator/rbac/qatdeviceplugin_editor_role.yaml b/deployments/operator/rbac/qatdeviceplugin_editor_role.yaml
diff --git a/deployments/operator/rbac/qatdeviceplugin_viewer_role.yaml b/deployments/operator/rbac/qatdeviceplugin_viewer_role.yaml
diff --git a/test/e2e/utils/utils.go b/test/e2e/utils/utils.go
@@ -126,7 +126,7 @@ func CreateKustomizationOverlay(namespace, base, overlay string) error {
 	}
 
 	relPath = relPath + base[1:]
-	content := fmt.Sprintf("namespace: %s\nbases:\n  - %s", namespace, relPath)
+	content := fmt.Sprintf("namespace: %s\nresources:\n  - %s", namespace, relPath)
 
 	return os.WriteFile(overlay+"/kustomization.yaml", []byte(content), 0600)
 }

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func CreateKustomizationOverlay(namespace, base, overlay string) error {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`relPath = relPath + base[1:]`
`129`		`- content := fmt.Sprintf("namespace: %s\nbases:\n - %s", namespace, relPath)`
	`129`	`+ content := fmt.Sprintf("namespace: %s\nresources:\n - %s", namespace, relPath)`
`130`	`130`
`131`	`131`	`return os.WriteFile(overlay+"/kustomization.yaml", []byte(content), 0600)`
`132`	`132`	`}`