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

deployment fixes
2025-06-03 03:59:37 +00:00 · 2023-02-22 13:23:01 +02:00 · 2023-02-22 13:23:01 +02:00 · fd67c5cd6f
commit fd67c5cd6f
parent 59126690ce 3dc815cda9
23 changed files with 20 additions and 147 deletions
--- a/2
+++ b/2
@ -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
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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

--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- a/deployments/operator/rbac/fpgadeviceplugin_editor_role.yaml
+++ b/deployments/operator/rbac/fpgadeviceplugin_editor_role.yaml
@ -1,24 +0,0 @@
-# permissions for end users to edit fpgadeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: fpgadeviceplugin-editor-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - fpgadeviceplugins
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - fpgadeviceplugins/status
-  verbs:
-  - get
--- a/deployments/operator/rbac/fpgadeviceplugin_viewer_role.yaml
+++ b/deployments/operator/rbac/fpgadeviceplugin_viewer_role.yaml
@ -1,20 +0,0 @@
-# permissions for end users to view fpgadeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: fpgadeviceplugin-viewer-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - fpgadeviceplugins
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - fpgadeviceplugins/status
-  verbs:
-  - get
--- a/deployments/operator/rbac/gpudeviceplugin_editor_role.yaml
+++ b/deployments/operator/rbac/gpudeviceplugin_editor_role.yaml
@ -1,24 +0,0 @@
-# permissions for end users to edit gpudeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: gpudeviceplugin-editor-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - gpudeviceplugins
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - gpudeviceplugins/status
-  verbs:
-  - get
--- a/deployments/operator/rbac/gpudeviceplugin_viewer_role.yaml
+++ b/deployments/operator/rbac/gpudeviceplugin_viewer_role.yaml
@ -1,20 +0,0 @@
-# permissions for end users to view gpudeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: gpudeviceplugin-viewer-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - gpudeviceplugins
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - gpudeviceplugins/status
-  verbs:
-  - get
--- a/deployments/operator/rbac/qatdeviceplugin_editor_role.yaml
+++ b/deployments/operator/rbac/qatdeviceplugin_editor_role.yaml
@ -1,24 +0,0 @@
-# permissions for end users to edit qatdeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: qatdeviceplugin-editor-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - qatdeviceplugins
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - qatdeviceplugins/status
-  verbs:
-  - get
--- a/deployments/operator/rbac/qatdeviceplugin_viewer_role.yaml
+++ b/deployments/operator/rbac/qatdeviceplugin_viewer_role.yaml
@ -1,20 +0,0 @@
-# permissions for end users to view qatdeviceplugins.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: qatdeviceplugin-viewer-role
-rules:
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - qatdeviceplugins
-  verbs:
-  - get
-  - list
-  - watch
- apiGroups:
-  - deviceplugin.intel.com
-  resources:
-  - qatdeviceplugins/status
-  verbs:
-  - get
--- 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)
 }