From 09aab2c06b7c8181ae145852895afe9478d7e680 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Fri, 9 Feb 2024 15:31:48 +0100 Subject: [PATCH] fix: disable persistence by default --- vcluster/argo-staging-cluster.yaml | 18 +++++++++++++ vcluster/chart/values.yaml | 2 +- vcluster/create-vcluster.sh | 42 ++++++++++++++++-------------- 3 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 vcluster/argo-staging-cluster.yaml diff --git a/vcluster/argo-staging-cluster.yaml b/vcluster/argo-staging-cluster.yaml new file mode 100644 index 00000000..9c05593a --- /dev/null +++ b/vcluster/argo-staging-cluster.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Secret +metadata: + annotations: + managed-by: argocd.argoproj.io + labels: + argocd.argoproj.io/secret-type: cluster + name: staging-vcluster + namespace: argocd +stringData: + config: | + {"bearerToken":"eyJhbGciOiJSUzI1NiIsImtpZCI6IlhjQmkwcEtPTU0yVUw1Z2lmTHN3RlhFeUViSS1wY3Rid1RPMlphZ0dzT0EifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi10b2tlbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjdjNmUzZmQ4LWFmZmItNDQ4Yi1hZTJhLTlmYjA5N2ZkMjA5MCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.uqszE0yNek682Eme9j-Ht66CPfbi01W4-p7hce6ug0MLPMjqXhikJV94wyNZtVT71YmHXRARA1_Fa08OFvvgvzKlEP1BE-vn1V6g8tHPOr-oR26ikKKQ9qYLol4yyaR3y8kMd5KlWxNbRIcHNj95AEm_RjCJwKICB3fd6DU0mEFBv9TloclilqKV0Mgjz3fsugLkJdgcR0VSG2_O_zlk99MY8wCIm0MYonH9plBPbNtwVUXzENb3K1qWpnro_5i28vjlKvo1ANhLMMlsulQxBmM76WJgForZR6iQNMZUtUjjxPbbyTqg7oxbPePSI7V2FGtzRavCzxRJdW2tOIu9qg","tlsClientConfig":{"insecure":true}} + name: vcluster-staging + server: https://staging-vcluster.staging-vcluster:443 +type: Opaque + + + diff --git a/vcluster/chart/values.yaml b/vcluster/chart/values.yaml index 45832fbe..5abb593d 100644 --- a/vcluster/chart/values.yaml +++ b/vcluster/chart/values.yaml @@ -1,2 +1,2 @@ environment: staging -persistence: true +persistence: false diff --git a/vcluster/create-vcluster.sh b/vcluster/create-vcluster.sh index c3105d1a..cd3a8620 100755 --- a/vcluster/create-vcluster.sh +++ b/vcluster/create-vcluster.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # -if [ $# != 1 ]; then - echo "usage: $0 cluster" +if [ ! $# -ge 1 ]; then + echo "usage: $0 cluster [helm args]" exit 1 fi @@ -11,41 +11,43 @@ if [ ! -d chart ]; then exit 1 fi -cluster=$1 -ns=$cluster-vcluster +k='kubectl --context oceanbox' -kubectl get ns $ns 2>&1 > /dev/null || kubectl create ns $ns +name=$1 +ns=$name-vcluster +shift -helm template -n $ns $1 ./chart --set persistence=false | kubectl --context oceanbox apply -f - +$k get ns $ns >/dev/null 2>&1 || $k create ns $ns +helm template -n $ns $@ $name ./chart | $k apply -f - # configure_cluster_files () { -# mkdir -p _$cluster/host _$cluster/vcluster +# mkdir -p _$name/host _$name/vcluster # cd templates # for i in values.yaml host/*.yaml vcluster/*.yaml; do -# sed "s//$cluster/g" $i > ../_$cluster/$i +# sed "s//$name/g" $i > ../_$name/$i # done # cd .. # } # configure_cluster_files -# kubectl apply -n $ns -f _$cluster/host/cnpg.yaml +# kubectl apply -n $ns -f _$name/host/cnpg.yaml # echo "Waiting for databases to become ready..." # kubectl wait -n $ns --for=condition=ready=true cluster $ns-db --timeout=60s -# kubectl apply -n $ns -f _$cluster/host/generate-cnp-rules.yaml -# kubectl apply -n $ns -f _$cluster/host/rbac.yaml -# kubectl apply -n $ns -f _$cluster/host/jaeger.yaml +# kubectl apply -n $ns -f _$name/host/generate-cnp-rules.yaml +# kubectl apply -n $ns -f _$name/host/rbac.yaml +# kubectl apply -n $ns -f _$name/host/jaeger.yaml -# vcluster create $cluster -n $ns --distro k3s --connect=false -f _$cluster/values.yaml -# # helm template $cluster -n $ns -f _$cluster/values.yaml > k11n/_manifest.sh -# # kubectl kustomize k11n > _$cluster/manifest.yaml -# # kubectl apply -f _$cluster/manifest.yaml +# vcluster create $name -n $ns --distro k3s --connect=false -f _$name/values.yaml +# # helm template $name -n $ns -f _$name/values.yaml > k11n/_manifest.sh +# # kubectl kustomize k11n > _$name/manifest.yaml +# # kubectl apply -f _$name/manifest.yaml -# vcluster connect $cluster -- kubectl apply -f _$cluster/vcluster/rbac.yaml +# vcluster connect $name -- kubectl apply -f _$name/vcluster/rbac.yaml -# vcluster connect $cluster -- dapr init -k -# vcluster connect $cluster -- kubectl apply -f _$cluster/vcluster/tracing.yaml +# vcluster connect $name -- dapr init -k +# vcluster connect $name -- kubectl apply -f _$name/vcluster/tracing.yaml -# ./update-kubeconfig.sh $cluster +# ./update-kubeconfig.sh $name