diff --git a/contrib/firstboot.sh b/contrib/firstboot.sh index 72d7955..4e31771 100755 --- a/contrib/firstboot.sh +++ b/contrib/firstboot.sh @@ -15,12 +15,12 @@ k8sDeploy () { ansible-playbook init-cluster.yml # Sometimes it's still not ready on this stage, let's check it just to be sure while true ; do - echo "Waiting for node up..." - result=$(kubectl get nodes|awk '{print $2}'| tail -1| grep -nE '^Ready') - if [ -z "$result" ] ; then - break - fi - sleep 10 + echo "Waiting for node up..." + result=$(kubectl get nodes|awk '{print $2}'| tail -1| grep -nE '^Ready') + if [ -z "$result" ] ; then + break + fi + sleep 10 done cd ${groot}/contrib } @@ -29,7 +29,7 @@ InstallCSI () { helm install rimusz/hostpath-provisioner --generate-name } InstallRegistry () { - echo ToDo + helm repo add stable https://kubernetes-charts.storage.googleapis.com/ } InstallPGSQL () { helm repo add bitnami https://charts.bitnami.com/bitnami diff --git a/contrib/werf/docker-registry/.helm/templates/secret.yaml b/contrib/werf/docker-registry/.helm/templates/secret.yaml index e1f7d6f..c22fd30 100755 --- a/contrib/werf/docker-registry/.helm/templates/secret.yaml +++ b/contrib/werf/docker-registry/.helm/templates/secret.yaml @@ -9,9 +9,9 @@ metadata: release: {{ .Release.Name }} type: Opaque data: -# {{- if .Values.secrets.htpasswd }} -# htpasswd: {{ .Values.secrets.htpasswd | b64enc }} -# {{- end }} + {{- if .Values.secrets.htpasswd }} + htpasswd: {{ .Values.secrets.htpasswd | b64enc }} + {{- end }} {{- if .Values.secrets.haSharedSecret }} haSharedSecret: {{ .Values.secrets.haSharedSecret | b64enc | quote }} {{- else }} diff --git a/runme.sh b/runme.sh index c976a48..36fbf74 100755 --- a/runme.sh +++ b/runme.sh @@ -20,7 +20,7 @@ installvm() { 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}" && \ echo "Housekeeping..." && \ - rm -f ${apptmp}/kernel ${apptmp}/initrd && \ + rm -f ${apptmp}/kernel ${apptmp}/initrd } runvm() { echo "Look like we already has VM, let's go"