Skip to content

Commit b42c8ce

Browse files
authored
fix: private nodes k8s version issue (#2884)
1 parent 2bf6038 commit b42c8ce

File tree

3 files changed

+34
-0
lines changed

3 files changed

+34
-0
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
/.github/workflows/backport.yaml @Piotr1215
66
netlify.toml @loft-sh/Eng-Docs-Admin
77

8+
/.github/workflows/e2e.yaml @FabianKramm
9+
/.github/workflows/release.yaml @FabianKramm
810
/pkg/syncer/ @FabianKramm
911
/pkg/controllers/resources/pods/ @FabianKramm
1012
/pkg/controllers/resources/services/ @FabianKramm

chart/templates/_init-containers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
{{/* Bump $defaultTag value whenever k8s version is bumped */}}
1010
{{- define "vcluster.k8s.image.tag" -}}
1111
{{- if not (empty .Values.controlPlane.distro.k8s.version) -}}
12+
{{- if and .Values.privateNodes.enabled .Values.privateNodes.importNodeBinaries -}}
13+
{{ .Values.controlPlane.distro.k8s.version }}-full
14+
{{- else -}}
1215
{{ .Values.controlPlane.distro.k8s.version }}
16+
{{- end -}}
1317
{{- else -}}
1418
{{- if and .Values.privateNodes.enabled .Values.privateNodes.importNodeBinaries -}}
1519
{{ .Values.controlPlane.distro.k8s.image.tag }}-full

chart/tests/statefulset_test.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,4 +804,32 @@ tests:
804804
- equal:
805805
path: spec.template.spec.initContainers[0].image
806806
value: ghcr.io/loft-sh/kubernetes:v1.35.999
807+
808+
- it: private nodes k8s full image version
809+
set:
810+
controlPlane:
811+
distro:
812+
k8s:
813+
version: v1.35.999
814+
privateNodes:
815+
enabled: true
816+
asserts:
817+
- equal:
818+
path: spec.template.spec.initContainers[0].image
819+
value: ghcr.io/loft-sh/kubernetes:v1.35.999-full
820+
821+
- it: private nodes k8s full image disabled version
822+
set:
823+
controlPlane:
824+
distro:
825+
k8s:
826+
image:
827+
tag: v1.35.999
828+
privateNodes:
829+
enabled: true
830+
importNodeBinaries: false
831+
asserts:
832+
- equal:
833+
path: spec.template.spec.initContainers[0].image
834+
value: ghcr.io/loft-sh/kubernetes:v1.35.999
807835

0 commit comments

Comments
 (0)