Skip to content

Test k3s edge #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 16, 2023
Merged

Test k3s edge #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
650dcdb
Change k3s.yaml from 127.0.0.1 to correct IP
alexandref75 Feb 16, 2023
a62665f
Fix chart version so artifacts are created
alexandref75 Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/smarter-k3s-edge/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 18 additions & 2 deletions charts/smarter-k3s-edge/templates/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down