Skip to content

Commit

Permalink
[squash me!] Add required for URLs + YQ variable fix for older make
Browse files Browse the repository at this point in the history
  • Loading branch information
a13x5 committed Dec 26, 2024
1 parent 57fbbea commit 8180952
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export PROVIDER_TEMPLATES_DIR
CLUSTER_TEMPLATES_DIR := $(TEMPLATES_DIR)/cluster
CHARTS_PACKAGE_DIR ?= $(LOCALBIN)/charts
EXTENSION_CHARTS_PACKAGE_DIR ?= $(LOCALBIN)/charts/extensions
K0S_VERSION = $(shell $$YQ '.k0s.version' $(CLUSTER_TEMPLATES_DIR)/vsphere-standalone-cp/values.yaml)
K0S_VERSION = $(shell $(YQ) '.k0s.version' $(CLUSTER_TEMPLATES_DIR)/vsphere-standalone-cp/values.yaml)
K0S_AG_IMAGE = k0s-ag-image:$(subst +,-,$(K0S_VERSION))
$(EXTENSION_CHARTS_PACKAGE_DIR): | $(LOCALBIN)
mkdir -p $(EXTENSION_CHARTS_PACKAGE_DIR)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
spec:
version: {{ .Values.k0s.version }}
{{- if .Values.airgap }}
downloadURL: {{ .Values.k0s.downloadURL }}
downloadURL: {{ required ".Values.k0s.downloadURL is required on airgap deployment" .Values.k0s.downloadURL }}
{{- end }}
files:
- path: /home/{{ .Values.ssh.user }}/.ssh/authorized_keys
Expand All @@ -16,6 +16,6 @@ spec:
preStartCommands:
{{- if .Values.airgap }}
- mkdir -p /var/lib/k0s/images
- curl -fsL {{ .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
- curl -fsL {{ required ".Values.k0s.bundleURL is required on airgap deployment" .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
{{- end }}
- chown {{ .Values.ssh.user }} /home/{{ .Values.ssh.user }}/.ssh/authorized_keys
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
version: {{ .Values.k0s.version }}
k0sConfigSpec:
{{- if .Values.airgap }}
downloadURL: {{ .Values.k0s.downloadURL }}
downloadURL: {{ required ".Values.k0s.downloadURL is required on airgap deployment" .Values.k0s.downloadURL }}
{{- end }}
files:
- path: /home/{{ .Values.controlPlane.ssh.user }}/.ssh/authorized_keys
Expand All @@ -16,7 +16,7 @@ spec:
preStartCommands:
{{- if .Values.airgap }}
- mkdir -p /var/lib/k0s/images
- curl -fsL {{ .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
- curl -fsL {{ required ".Values.k0s.bundleURL is required on airgap deployment" .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
{{- end }}
- chown {{ .Values.controlPlane.ssh.user }} /home/{{ .Values.controlPlane.ssh.user }}/.ssh/authorized_keys
- sed -i 's/"externalAddress":"{{ .Values.controlPlaneEndpointIP }}",//' /etc/k0s.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
spec:
version: {{ .Values.k0s.version }}
{{- if .Values.airgap }}
downloadURL: {{ .Values.k0s.downloadURL }}
downloadURL: {{ required ".Values.k0s.downloadURL is required on airgap deployment" .Values.k0s.downloadURL }}
{{- end }}
files:
- path: /home/{{ .Values.worker.ssh.user }}/.ssh/authorized_keys
Expand All @@ -16,6 +16,6 @@ spec:
preStartCommands:
{{- if .Values.airgap }}
- mkdir -p /var/lib/k0s/images
- curl -fsL {{ .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
- curl -fsL {{ required ".Values.k0s.bundleURL is required on airgap deployment" .Values.k0s.bundleURL }} -o /var/lib/k0s/images/k0s-airgap-bundle
{{- end }}
- chown {{ .Values.worker.ssh.user }} /home/{{ .Values.worker.ssh.user }}/.ssh/authorized_keys

0 comments on commit 8180952

Please sign in to comment.