operator: move to controller-tools v0.10.0

With the latest version of controller-tools, we get to set reinvocationPolicy tag so that we no longer have to add that field manually in our Admission Webhook manifests. Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2025-06-03 03:59:37 +00:00 · 2022-09-21 19:36:44 +03:00 · 2022-09-21 19:36:44 +03:00 · 0f5afc258d
commit 0f5afc258d
parent 0220a1ea38
16 changed files with 17 additions and 17 deletions
--- a/2
+++ b/2
@ -9,7 +9,7 @@ BUILDER ?= "docker"
 EXTRA_BUILD_ARGS ?= ""

 CERT_MANAGER_VERSION ?= v1.8.1
-CONTROLLER_GEN_VERSION ?= v0.9.2
+CONTROLLER_GEN_VERSION ?= v0.10.0
 GOLANGCI_LINT_VERSION ?= v1.48.0
 KIND_VERSION ?= v0.14.0
 GOLICENSES_VERSION ?= v1.2.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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  creationTimestamp: null
  name: fpgaregions.fpga.intel.com
 spec:
--- 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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  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.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
  creationTimestamp: null
  name: fpgaregions.fpga.intel.com
 spec:
--- a/deployments/operator/webhook/manifests.yaml
+++ b/deployments/operator/webhook/manifests.yaml
@ -134,6 +134,7 @@ webhooks:
      path: /mutate-deviceplugin-intel-com-v1-sgxdeviceplugin
  failurePolicy: Fail
  name: msgxdeviceplugin.kb.io
+  reinvocationPolicy: IfNeeded
  rules:
  - apiGroups:
    - deviceplugin.intel.com
@ -172,9 +173,9 @@ webhooks:
      name: webhook-service
      namespace: system
      path: /pods-sgx
-  reinvocationPolicy: IfNeeded
  failurePolicy: Ignore
  name: sgx.mutator.webhooks.intel.com
+  reinvocationPolicy: IfNeeded
  rules:
  - apiGroups:
    - ""
--- a/deployments/sgx_admissionwebhook/webhook/manifests.yaml
+++ b/deployments/sgx_admissionwebhook/webhook/manifests.yaml
@ -1,4 +1,3 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
@ -13,9 +12,9 @@ webhooks:
      name: webhook-service
      namespace: system
      path: /pods-sgx
-  reinvocationPolicy: IfNeeded
  failurePolicy: Ignore
  name: sgx.mutator.webhooks.intel.com
+  reinvocationPolicy: IfNeeded
  rules:
  - apiGroups:
    - ""
--- a/pkg/apis/deviceplugin/v1/sgxdeviceplugin_webhook.go
+++ b/pkg/apis/deviceplugin/v1/sgxdeviceplugin_webhook.go
@ -42,7 +42,7 @@ func (r *SgxDevicePlugin) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }

-// +kubebuilder:webhook:path=/mutate-deviceplugin-intel-com-v1-sgxdeviceplugin,mutating=true,failurePolicy=fail,groups=deviceplugin.intel.com,resources=sgxdeviceplugins,verbs=create;update,versions=v1,name=msgxdeviceplugin.kb.io,sideEffects=None,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/mutate-deviceplugin-intel-com-v1-sgxdeviceplugin,mutating=true,failurePolicy=fail,groups=deviceplugin.intel.com,resources=sgxdeviceplugins,verbs=create;update,versions=v1,name=msgxdeviceplugin.kb.io,sideEffects=None,admissionReviewVersions=v1,reinvocationPolicy=IfNeeded

 var _ webhook.Defaulter = &SgxDevicePlugin{}

--- a/pkg/webhooks/sgx/sgx.go
+++ b/pkg/webhooks/sgx/sgx.go
@ -27,7 +27,7 @@ import (
 	"github.com/intel/intel-device-plugins-for-kubernetes/pkg/internal/containers"
 )

-// +kubebuilder:webhook:path=/pods-sgx,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create;update,versions=v1,name=sgx.mutator.webhooks.intel.com,sideEffects=None,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/pods-sgx,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create;update,versions=v1,name=sgx.mutator.webhooks.intel.com,sideEffects=None,admissionReviewVersions=v1,reinvocationPolicy=IfNeeded

 // Mutator annotates Pods.
 type Mutator struct {