From d2210df9ec091d64cc0f1750c7bbe35cf17b7ef1 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 12 Mar 2025 15:28:20 +0100 Subject: [PATCH] Fix conflict of deploying KubeVirt Instancetypes (#691) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have common-instance-types deployed by kubevirt-operator and separate helm-chart. In this case operator always overrides the resource by default ones. This PR disables common-instance-types deployment for kubevirt-operator ## Summary by CodeRabbit - **Chores** - Updated the package’s internal identifier to enhance consistency across integration points. - **New Features** - Introduced a new configuration option that enables a deployment toggle for managing instance types (disabled by default). --- packages/system/kubevirt-instancetypes/Makefile | 2 +- packages/system/kubevirt/templates/kubevirt-cr.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/system/kubevirt-instancetypes/Makefile b/packages/system/kubevirt-instancetypes/Makefile index adc17909..d0498f10 100644 --- a/packages/system/kubevirt-instancetypes/Makefile +++ b/packages/system/kubevirt-instancetypes/Makefile @@ -1,4 +1,4 @@ -export NAME=kubevirt-common-instancetypes +export NAME=kubevirt-instancetypes export NAMESPACE=cozy-kubevirt include ../../../scripts/package.mk diff --git a/packages/system/kubevirt/templates/kubevirt-cr.yaml b/packages/system/kubevirt/templates/kubevirt-cr.yaml index f5878da3..5b0b3a0b 100644 --- a/packages/system/kubevirt/templates/kubevirt-cr.yaml +++ b/packages/system/kubevirt/templates/kubevirt-cr.yaml @@ -7,6 +7,8 @@ metadata: spec: certificateRotateStrategy: {} configuration: + commonInstancetypesDeployment: + enabled: false developerConfiguration: featureGates: - HotplugVolumes