From c831f5344495cdf8b9d2c7f272ff86691fbcd4df Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 9 Jul 2025 08:05:41 +0200 Subject: [PATCH] [virtual-machine] Fix cloudInit and sshKeys Signed-off-by: Andrei Kvapil --- .../virtual-machine/templates/secret.yaml | 12 +++++++++-- .../apps/virtual-machine/templates/vm.yaml | 21 ++----------------- .../apps/vm-instance/templates/secret.yaml | 12 +++++++++-- packages/apps/vm-instance/templates/vm.yaml | 20 ++---------------- .../dashboard/images/dashboard/Dockerfile | 2 +- .../dashboard/images/kubeapps-apis/Dockerfile | 2 +- 6 files changed, 26 insertions(+), 43 deletions(-) diff --git a/packages/apps/virtual-machine/templates/secret.yaml b/packages/apps/virtual-machine/templates/secret.yaml index a92a7b6b..6142d102 100644 --- a/packages/apps/virtual-machine/templates/secret.yaml +++ b/packages/apps/virtual-machine/templates/secret.yaml @@ -9,7 +9,7 @@ stringData: key{{ $k }}: {{ quote $v }} {{- end }} {{- end }} -{{- if .Values.cloudInit }} +{{- if or .Values.cloudInit .Values.sshKeys }} --- apiVersion: v1 kind: Secret @@ -17,5 +17,13 @@ metadata: name: {{ include "virtual-machine.fullname" . }}-cloud-init stringData: userdata: | - {{- .Values.cloudInit | nindent 4 }} + {{- if .Values.cloudInit }} + {{- .Values.cloudInit | nindent 4 }} + {{- else if and (.Values.sshKeys) (not .Values.cloudInit) }} + #cloud-config + ssh_authorized_keys: + {{- range .Values.sshKeys }} + - {{ quote . }} + {{- end }} + {{- end }} {{- end }} diff --git a/packages/apps/virtual-machine/templates/vm.yaml b/packages/apps/virtual-machine/templates/vm.yaml index 01fd2850..744ec220 100644 --- a/packages/apps/virtual-machine/templates/vm.yaml +++ b/packages/apps/virtual-machine/templates/vm.yaml @@ -92,7 +92,7 @@ spec: - disk: bus: scsi name: systemdisk - {{- if .Values.sshKeys }} + {{- if or .Values.cloudInit .Values.sshKeys }} - disk: bus: virtio name: cloudinitdisk @@ -122,28 +122,11 @@ spec: - name: systemdisk dataVolume: name: {{ include "virtual-machine.fullname" . }} - - {{- if and .Values.sshKeys .Values.cloudInit }} + {{- if or .Values.cloudInit .Values.sshKeys }} - name: cloudinitdisk cloudInitNoCloud: secretRef: name: {{ include "virtual-machine.fullname" . }}-cloud-init - {{- else if .Values.sshKeys }} - - name: cloudinitdisk - cloudInitNoCloud: - userData: | - {{ printf "%s" "#cloud-config" }} - ssh_authorized_keys: - {{- range .Values.sshKeys }} - - {{ . }} - {{- end }} - chpasswd: - expire: false - {{- else }} - - name: cloudinitdisk - cloudInitNoCloud: - userData: | - {{ printf "%s" "#cloud-config" }} {{- end }} networks: diff --git a/packages/apps/vm-instance/templates/secret.yaml b/packages/apps/vm-instance/templates/secret.yaml index a92a7b6b..6142d102 100644 --- a/packages/apps/vm-instance/templates/secret.yaml +++ b/packages/apps/vm-instance/templates/secret.yaml @@ -9,7 +9,7 @@ stringData: key{{ $k }}: {{ quote $v }} {{- end }} {{- end }} -{{- if .Values.cloudInit }} +{{- if or .Values.cloudInit .Values.sshKeys }} --- apiVersion: v1 kind: Secret @@ -17,5 +17,13 @@ metadata: name: {{ include "virtual-machine.fullname" . }}-cloud-init stringData: userdata: | - {{- .Values.cloudInit | nindent 4 }} + {{- if .Values.cloudInit }} + {{- .Values.cloudInit | nindent 4 }} + {{- else if and (.Values.sshKeys) (not .Values.cloudInit) }} + #cloud-config + ssh_authorized_keys: + {{- range .Values.sshKeys }} + - {{ quote . }} + {{- end }} + {{- end }} {{- end }} diff --git a/packages/apps/vm-instance/templates/vm.yaml b/packages/apps/vm-instance/templates/vm.yaml index e11da732..4195c1c6 100644 --- a/packages/apps/vm-instance/templates/vm.yaml +++ b/packages/apps/vm-instance/templates/vm.yaml @@ -68,7 +68,7 @@ spec: {{- fail (printf "Specified disk not exists in cluster: %s" .name) }} {{- end }} {{- end }} - {{- if or .Values.sshKeys .Values.cloudInit }} + {{- if or .Values.cloudInit .Values.sshKeys }} - name: cloudinitdisk disk: bus: virtio @@ -95,27 +95,11 @@ spec: dataVolume: name: vm-disk-{{ .name }} {{- end }} - {{- if and .Values.sshKeys .Values.cloudInit }} + {{- if or .Values.cloudInit .Values.sshKeys }} - name: cloudinitdisk cloudInitNoCloud: secretRef: name: {{ include "virtual-machine.fullname" . }}-cloud-init - {{- else if .Values.sshKeys }} - - name: cloudinitdisk - cloudInitNoCloud: - userData: | - {{ printf "%s" "#cloud-config" }} - ssh_authorized_keys: - {{- range .Values.sshKeys }} - - {{ . }} - {{- end }} - chpasswd: - expire: false - {{- else }} - - name: cloudinitdisk - cloudInitNoCloud: - userData: | - {{ printf "%s" "#cloud-config" }} {{- end }} networks: - name: default diff --git a/packages/system/dashboard/images/dashboard/Dockerfile b/packages/system/dashboard/images/dashboard/Dockerfile index 91663e05..184428dc 100644 --- a/packages/system/dashboard/images/dashboard/Dockerfile +++ b/packages/system/dashboard/images/dashboard/Dockerfile @@ -1,7 +1,7 @@ FROM bitnami/node:20.15.1 AS build WORKDIR /app -ARG COMMIT_REF=6856b66f9244ef1b2703a2f30899366e0ba040de +ARG COMMIT_REF=e1382f51c6db1bca0a8ecd454407c8e282fe0243 RUN wget -O- https://github.com/cozystack/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=2 kubeapps-${COMMIT_REF}/dashboard RUN yarn install --frozen-lockfile diff --git a/packages/system/dashboard/images/kubeapps-apis/Dockerfile b/packages/system/dashboard/images/kubeapps-apis/Dockerfile index f2aea7a3..638219c8 100644 --- a/packages/system/dashboard/images/kubeapps-apis/Dockerfile +++ b/packages/system/dashboard/images/kubeapps-apis/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM alpine AS source -ARG COMMIT_REF=6856b66f9244ef1b2703a2f30899366e0ba040de +ARG COMMIT_REF=e1382f51c6db1bca0a8ecd454407c8e282fe0243 RUN apk add --no-cache patch WORKDIR /source RUN wget -O- https://github.com/cozystack/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=1