This commit is contained in:
D4rk4 2020-08-01 21:09:32 +02:00
parent 1b9a650a19
commit fb59e92386
3 changed files with 11 additions and 11 deletions

View file

@ -15,12 +15,12 @@ k8sDeploy () {
ansible-playbook init-cluster.yml ansible-playbook init-cluster.yml
# Sometimes it's still not ready on this stage, let's check it just to be sure # Sometimes it's still not ready on this stage, let's check it just to be sure
while true ; do while true ; do
echo "Waiting for node up..." echo "Waiting for node up..."
result=$(kubectl get nodes|awk '{print $2}'| tail -1| grep -nE '^Ready') result=$(kubectl get nodes|awk '{print $2}'| tail -1| grep -nE '^Ready')
if [ -z "$result" ] ; then if [ -z "$result" ] ; then
break break
fi fi
sleep 10 sleep 10
done done
cd ${groot}/contrib cd ${groot}/contrib
} }
@ -29,7 +29,7 @@ InstallCSI () {
helm install rimusz/hostpath-provisioner --generate-name helm install rimusz/hostpath-provisioner --generate-name
} }
InstallRegistry () { InstallRegistry () {
echo ToDo helm repo add stable https://kubernetes-charts.storage.googleapis.com/
} }
InstallPGSQL () { InstallPGSQL () {
helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add bitnami https://charts.bitnami.com/bitnami

View file

@ -9,9 +9,9 @@ metadata:
release: {{ .Release.Name }} release: {{ .Release.Name }}
type: Opaque type: Opaque
data: data:
# {{- if .Values.secrets.htpasswd }} {{- if .Values.secrets.htpasswd }}
# htpasswd: {{ .Values.secrets.htpasswd | b64enc }} htpasswd: {{ .Values.secrets.htpasswd | b64enc }}
# {{- end }} {{- end }}
{{- if .Values.secrets.haSharedSecret }} {{- if .Values.secrets.haSharedSecret }}
haSharedSecret: {{ .Values.secrets.haSharedSecret | b64enc | quote }} haSharedSecret: {{ .Values.secrets.haSharedSecret | b64enc | quote }}
{{- else }} {{- else }}

View file

@ -20,7 +20,7 @@ installvm() {
echo "Preparing K8S VM..." && \ echo "Preparing K8S VM..." && \
${qemu} -kernel ${apptmp}/kernel -initrd ${apptmp}/initrd -append "console=ttyS0,115200n8 apt-setup/proposed=true nomodeset fb=false priority=critical locale=en_US url=${seed}" && \ ${qemu} -kernel ${apptmp}/kernel -initrd ${apptmp}/initrd -append "console=ttyS0,115200n8 apt-setup/proposed=true nomodeset fb=false priority=critical locale=en_US url=${seed}" && \
echo "Housekeeping..." && \ echo "Housekeeping..." && \
rm -f ${apptmp}/kernel ${apptmp}/initrd && \ rm -f ${apptmp}/kernel ${apptmp}/initrd
} }
runvm() { runvm() {
echo "Look like we already has VM, let's go" echo "Look like we already has VM, let's go"