File tree Expand file tree Collapse file tree 3 files changed +28
-19
lines changed Expand file tree Collapse file tree 3 files changed +28
-19
lines changed Original file line number Diff line number Diff line change @@ -69,10 +69,17 @@ data "kubernetes_secret" "harvester-k3s-dockerhub-pull-account" {
6969}
7070
7171locals {
72- startup_script = templatefile (" ${ path . module } /../../scripts/bootstrap-k3s.sh" , {
72+ bootstrap_script = templatefile (" ${ path . module } /../../scripts/bootstrap-k3s.sh" , {
7373 vm_name = var.preview_name
7474 })
7575
76+ trustmanager_script = file (" ${ path . module } /../../scripts/install-trustmanager.sh" )
77+
78+ startup_script = <<- EOT
79+ ${ local . bootstrap_script }
80+ ${ local . trustmanager_script }
81+ EOT
82+
7683 cloudinit_user_data = templatefile (" ${ path . module } /cloudinit.yaml" , {
7784 dockerhub_user = data.kubernetes_secret.harvester- k3s- dockerhub- pull- account.data[" username" ]
7885 dockerhub_passwd = data.kubernetes_secret.harvester- k3s- dockerhub- pull- account.data[" password" ]
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+
3+ set -eo pipefail
4+
5+ logger -t install-trustmanager " Starting to install trust manager"
6+
7+ # shellcheck disable=SC2016
8+ timeout 5m bash -c '
9+ while [[ -z $(kubectl get certificate trust-manager -n cert-manager --ignore-not-found=true) ]]
10+ do
11+ logger -t install-trustmanager "Sleeping..."
12+ sleep 5
13+ kubectl apply -f /var/lib/gitpod/manifests/trust-manager.yaml --wait=false || true
14+ logger -t install-trustmanager "Trust manager applied"
15+ done
16+ '
17+
18+ kubectl wait --for=condition=Available --timeout=300s deployment -n cert-manager trust-manager
19+
20+ logger -t install-trustmanager " Finishing installing trust manager"
Original file line number Diff line number Diff line change @@ -179,23 +179,6 @@ function installFluentBit {
179179 upgrade --install fluent-bit fluent/fluent-bit --version 0.21.6 -n " ${PREVIEW_NAMESPACE} " -f " $ROOT /.werft/vm/charts/fluentbit/values.yaml"
180180}
181181
182- function installTrustManager {
183- helm3 \
184- --kubeconfig " ${PREVIEW_K3S_KUBE_PATH} " \
185- --kube-context " ${PREVIEW_K3S_KUBE_CONTEXT} " \
186- repo add jetstack https://charts.jetstack.io
187-
188- helm3 \
189- --kubeconfig " ${PREVIEW_K3S_KUBE_PATH} " \
190- --kube-context " ${PREVIEW_K3S_KUBE_CONTEXT} " \
191- repo update
192-
193- helm3 \
194- --kubeconfig " ${PREVIEW_K3S_KUBE_PATH} " \
195- --kube-context " ${PREVIEW_K3S_KUBE_CONTEXT} " \
196- upgrade --install --namespace cert-manager trust-manager jetstack/trust-manager --wait
197- }
198-
199182# ====================================
200183# Prerequisites
201184# ====================================
218201copyImagePullSecret
219202installRookCeph
220203installFluentBit
221- installTrustManager
222204
223205# ========
224206# Init
You can’t perform that action at this time.
0 commit comments