diff --git a/k3d/Tiltfile b/k3d/Tiltfile index 52c2687bb..84c7f1544 100644 --- a/k3d/Tiltfile +++ b/k3d/Tiltfile @@ -19,6 +19,7 @@ helm_resource('homepage', 'jameswynn/homepage', ], # image_selector= "k3d-registry.localhost:55000/homepage:local", flags=[ - "-f", "k3d-helm-values.yaml" + "-f", "k3d-helm-values.yaml", + "--set", "persistence.dotnext.enabled=true" ] ) diff --git a/k3d/k3d-deploy.sh b/k3d/k3d-deploy.sh index 3379db8f1..ef00c6ff4 100755 --- a/k3d/k3d-deploy.sh +++ b/k3d/k3d-deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -DOCKER_BUILDKIT=1 docker build -t k3d-registry.localhost:55000/homepage:local . +DOCKER_BUILDKIT=1 docker build -t k3d-registry.localhost:55000/homepage:local .. docker push k3d-registry.localhost:55000/homepage:local HELM_REPO_NAME=jameswynn diff --git a/k3d/k3d-helm-values.yaml b/k3d/k3d-helm-values.yaml index 1fe61bf1b..60b6fe381 100644 --- a/k3d/k3d-helm-values.yaml +++ b/k3d/k3d-helm-values.yaml @@ -1,7 +1,7 @@ image: repository: k3d-registry.localhost:55000/homepage tag: local - pullPolicy: IfNotPresent + pullPolicy: Always config: bookmarks: @@ -68,9 +68,10 @@ ingress: pathType: Prefix persistence: - # this persists the .next directory which greatly improves successive pod startup times + # this persists the .next directory which greatly improves successive pod startup times in Tilt, + # but it breaks normal deployments, so it is disabled by default dotnext: - enabled: true + enabled: false type: pvc accessMode: ReadWriteOnce size: 1Gi diff --git a/k3d/k3d-up.sh b/k3d/k3d-up.sh index c90af8f04..e16104012 100755 --- a/k3d/k3d-up.sh +++ b/k3d/k3d-up.sh @@ -6,4 +6,4 @@ chmod 600 kubeconfig export KUBECONFIG=$(pwd)/kubeconfig echo "Waiting for traefik install job to complete (CTRL+C is safe if you're impatient)" -kubectl wait jobs/helm-install-traefik -n kube-system --for condition=complete --timeout 90s && echo "Completed" || echo "Timed out" +kubectl wait jobs/helm-install-traefik -n kube-system --for condition=complete --timeout 90s && echo "Completed" || echo "Timed out (but it should still come up eventually)"