From 650dcdbf43d42d5b9e6ee155cf8b0a00dc104f7f Mon Sep 17 00:00:00 2001 From: Alexandre Peixoto Ferreira Date: Thu, 16 Feb 2023 16:28:14 -0600 Subject: [PATCH 1/2] Change k3s.yaml from 127.0.0.1 to correct IP Signed-off-by: Alexandre Peixoto Ferreira --- charts/smarter-k3s-edge/templates/common.yaml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/charts/smarter-k3s-edge/templates/common.yaml b/charts/smarter-k3s-edge/templates/common.yaml index c748663..4d5980a 100644 --- a/charts/smarter-k3s-edge/templates/common.yaml +++ b/charts/smarter-k3s-edge/templates/common.yaml @@ -127,6 +127,23 @@ data: --node-label smarter.type=edge \\ --node-taint smarter.type=edge:NoSchedule \\ --node-label smarter-build=user-installed + nginx-start.sh: | + #!/bin/bash + # + apk update + apk add openssl + echo -e "US\n\n\nSmarter\n\n"{{ default .Values.configuration.hostIP .Values.configuration.externalHostIP }}"\n\n" | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt + openssl dhparam -out /etc/ssl/certs/dhparam.pem 2048 + mkdir -p /var/www/html + until [ -f /etc/rancher/k3s/k3s.yaml ] + do + sleep 1 + done + sed -e "s/127\.0\.0\.1/"{{ default .Values.configuration.hostIP .Values.configuration.externalHostIP }}"/" /etc/rancher/k3s/k3s.yaml > /var/www/html/k3s.yaml.{{ .Values.configuration.id }} + ln -s /var/lib/rancher/k3s/server/token /var/www/html/token.{{ .Values.configuration.id }} + ln -s /etc/nginx/conf.d/k3s-start.sh /var/www/html/k3s-start.sh.{{ .Values.configuration.id }} + chmod -R ago+rw /var/www/html + nginx -c /etc/nginx/conf.d/default.conf -g 'daemon off;' --- {{- end }} apiVersion: apps/v1 @@ -173,8 +190,7 @@ spec: - name: {{ .Values.application.appName }}-nginx image: nginx:1.23.2-alpine command: [ "/bin/sh", - "-c", - "apk update;apk add openssl;echo -e '\n\n\n\n\n\n\n' | openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt;openssl dhparam -out /etc/ssl/certs/dhparam.pem 2048;mkdir -p /var/www/html;ln -s /etc/rancher/k3s/k3s.yaml /var/www/html/k3s.yaml.{{ .Values.configuration.id }};ln -s /var/lib/rancher/k3s/server/token /var/www/html/token.{{ .Values.configuration.id }};ln -s /etc/nginx/conf.d/k3s-start.sh /var/www/html/k3s-start.sh.{{ .Values.configuration.id }};chmod -R ago+rw /var/www/html;nginx -c /etc/nginx/conf.d/default.conf -g 'daemon off;'" ] + "/etc/nginx/conf.d/nginx-start.sh"] volumeMounts: - name: k3s-data mountPath: /var/lib/rancher/k3s From a62665f54537dcdc34b9764cdff4b25cc7a3969c Mon Sep 17 00:00:00 2001 From: Alexandre Peixoto Ferreira Date: Thu, 16 Feb 2023 16:59:06 -0600 Subject: [PATCH 2/2] Fix chart version so artifacts are created Signed-off-by: Alexandre Peixoto Ferreira --- charts/smarter-k3s-edge/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/smarter-k3s-edge/Chart.yaml b/charts/smarter-k3s-edge/Chart.yaml index 4909df6..9413763 100644 --- a/charts/smarter-k3s-edge/Chart.yaml +++ b/charts/smarter-k3s-edge/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: smarter-k3s-edge -version: 0.0.3 +version: 0.0.4 type: application appVersion: v1.25.3-k3s1 description: K3s server on kubernetes