From 3be0ed325c134957209b73b717ba592a0b284509 Mon Sep 17 00:00:00 2001 From: Joel Takvorian Date: Tue, 28 May 2024 15:06:07 +0200 Subject: [PATCH] NETOBSERV-1665: use v1 for conversionReviewVersions Note we're talking here about versions of ConversionReview (ie. apiextension), NOT versions of our CRDs - Use same versions for flowcollector and flowmetrics - Use just v1 as the only other (v1beta1) was dropped a while ago (kube 1.22 / 2021) --- bundle/manifests/flows.netobserv.io_flowcollectors.yaml | 3 +-- bundle/manifests/netobserv-operator.clusterserviceversion.yaml | 3 +-- config/crd/patches/webhook_in_flowcollectors.yaml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml index 6e7e42501..94c77f07f 100644 --- a/bundle/manifests/flows.netobserv.io_flowcollectors.yaml +++ b/bundle/manifests/flows.netobserv.io_flowcollectors.yaml @@ -15,8 +15,7 @@ spec: namespace: netobserv path: /convert conversionReviewVersions: - - v1beta1 - - v1beta2 + - v1 group: flows.netobserv.io names: kind: FlowCollector diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml index 1d21057d5..db06a7b80 100644 --- a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml +++ b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml @@ -1335,8 +1335,7 @@ spec: version: 1.6.0-community webhookdefinitions: - admissionReviewVersions: - - v1beta1 - - v1beta2 + - v1 containerPort: 443 conversionCRDs: - flowcollectors.flows.netobserv.io diff --git a/config/crd/patches/webhook_in_flowcollectors.yaml b/config/crd/patches/webhook_in_flowcollectors.yaml index 04b0caf57..c9f0f1c03 100644 --- a/config/crd/patches/webhook_in_flowcollectors.yaml +++ b/config/crd/patches/webhook_in_flowcollectors.yaml @@ -13,5 +13,4 @@ spec: name: webhook-service path: /convert conversionReviewVersions: - - v1beta1 - - v1beta2 + - v1