From 01e2c0ba9170657e0986bf37e254380d037af18d Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Fri, 8 Dec 2023 14:50:29 +0200 Subject: [PATCH 1/5] Rename kubevirt values section to operator --- packages/kubevirt/charts/templates/kubevirt-operator.yaml | 8 ++++---- packages/kubevirt/charts/templates/kubevirt.yaml | 2 +- packages/kubevirt/charts/values.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/kubevirt/charts/templates/kubevirt-operator.yaml b/packages/kubevirt/charts/templates/kubevirt-operator.yaml index e9a78c7a..ddd90648 100644 --- a/packages/kubevirt/charts/templates/kubevirt-operator.yaml +++ b/packages/kubevirt/charts/templates/kubevirt-operator.yaml @@ -1284,15 +1284,15 @@ spec: - virt-operator env: - name: VIRT_OPERATOR_IMAGE - value: {{ .Values.kubevirt.image }}:{{ .Values.kubevirt.version }} + value: {{ .Values.operator.image }}:{{ .Values.operator.version }} - name: WATCH_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: KUBEVIRT_VERSION - value: {{ .Values.kubevirt.version }} - image: {{ .Values.kubevirt.image }}:{{ .Values.kubevirt.version }} - imagePullPolicy: {{ .Values.kubevirt.pullPolicy }} + value: {{ .Values.operator.version }} + image: {{ .Values.operator.image }}:{{ .Values.operator.version }} + imagePullPolicy: {{ .Values.operator.pullPolicy }} name: virt-operator ports: - containerPort: 8443 diff --git a/packages/kubevirt/charts/templates/kubevirt.yaml b/packages/kubevirt/charts/templates/kubevirt.yaml index 227f9b2f..6bf56342 100644 --- a/packages/kubevirt/charts/templates/kubevirt.yaml +++ b/packages/kubevirt/charts/templates/kubevirt.yaml @@ -9,5 +9,5 @@ spec: developerConfiguration: featureGates: [] customizeComponents: {} - imagePullPolicy: {{ .Values.kubevirt.pullPolicy }} + imagePullPolicy: {{ .Values.operator.pullPolicy }} workloadUpdateStrategy: {} diff --git a/packages/kubevirt/charts/values.yaml b/packages/kubevirt/charts/values.yaml index ffe04c60..3704484d 100644 --- a/packages/kubevirt/charts/values.yaml +++ b/packages/kubevirt/charts/values.yaml @@ -1,4 +1,4 @@ -kubevirt: +operator: image: registry.suse.com/suse/sles/15.5/virt-operator version: 1.1.0-150500.8.6.1 pullPolicy: IfNotPresent From 12bd7bafa3752cb412f4b916ea56adb82e78e04e Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Fri, 8 Dec 2023 16:08:27 +0200 Subject: [PATCH 2/5] Templatize KubeVirt resource --- assets/kubevirt/kubevirt-0.2.0.tgz | Bin 41766 -> 41887 bytes .../0.2.0/templates/kubevirt-operator.yaml | 8 +++---- charts/kubevirt/0.2.0/templates/kubevirt.yaml | 20 ++++++++++++---- charts/kubevirt/0.2.0/values.yaml | 11 ++++++++- index.yaml | 4 ++-- .../kubevirt/charts/templates/kubevirt.yaml | 22 +++++++++++++----- packages/kubevirt/charts/values.yaml | 9 +++++++ 7 files changed, 56 insertions(+), 18 deletions(-) diff --git a/assets/kubevirt/kubevirt-0.2.0.tgz b/assets/kubevirt/kubevirt-0.2.0.tgz index ed207224e9a94c5b37ae6bff832e4b29d0b6d80a..76b64ab99a4172b30de55dddab13b8359763dd25 100644 GIT binary patch delta 39061 zcmV)jK%u{;#sZ(m0+2s{HnuqU{?@0!PkHZH>ZdA6UXmX5@{S_A-I`doMsl2)Uw2O* z6nU!(EfQb=u;fZQ^V#QM<5pZiR!O!K;*Ufwk{8>>#og~+I)fGA^7vwjxty+X9R0_x z+sVnv$=A=H>;IpeoK*jR^6dFH|8e^K#j~$peEs#;FP{C!$?3CylNZna1D))ABsDD+ z67&B!*}AXlGLAdH@&)zdwkB-uYtr>E1Cy%0peNh0-6=jg8x#VAm?g652) z@6s83AYAT|Ks{ednTWIFV~+2q3nG{4EET{5MkP==4On~}&|rRyxx8om?l{JT9w(gr z3j!&QGgMTtjsq5dF`oT4QNK;}Z&R^a>`@%U8FEke$ZEEzxBLx{w90cVKAf(Xgi zQ;`bLhgSV@EFuucr!S^2j`e|bAMPQvDp8Ed>5G#WCnwW?-%r1up6(%(q)~LuA`-06 z(B=Fslh+&sP`S6~a8LCe0GDL0PA}Xri6z`hjwLMCXXxi&)N@AXWRY@xy442=g|LE1 z4dY_-8A5ZwGUf0ZOAu%1Z~ss*QXyGPeu4`YCyWA>!a{ExBSMN$MGS}ECt-C|djf)# z6S=-n1n#4Mo`--SU~zKI*_=dR24kqxO-dz+;U&y*8Y##;rRU-;qc@DnGbDKmdkEnu zV)xgatVje4cqIZHnQ5Upj)Zz6zzLp_h)4p$E(B+ZoAv~qzj?E_w`A<@(ro99NQz^k zNogRXv(xF*Z>G=m8#kbkU%HvUqkq99N;!<=@;B3eGWsteP9k+!j^Dm}|LS%sKgwP8 z(Z&CrzIaxl|Ic5%I2q~xW3&&z$$X9E5=%vUGKLNX8I44k10qyN97PbKfN`z}$y$*d zOH|MT%;yt|e*PIvZy*9JVEPuvAQBt^`sJ6AsCukNG<^>!3wdt{#%QA)4ksv|MJV;&p%I42y;RK z?K_;As+afCB!8?p8#Fbl1a)Q2n{5hj+mNOF%g5VV*|O8vU5!h|CFpgi7$!1E22w00y>xU#cF|Bm|m4fKvfT zuoyIr;}j$aGu=6XC^Td)A~BH=BFT_k5`hk8YrPaN-`=Ws30)wOKyWzSyPP9#sGI?! zgj`Ihu)?wajYxD)q6p0Zr9zEUAgl*(N87xz>ZS7Pl6kh6?qRl|_LauxJ_{a+49