diff --git a/vcluster/chart/.helmignore b/charts/vcluster/.helmignore similarity index 100% rename from vcluster/chart/.helmignore rename to charts/vcluster/.helmignore diff --git a/vcluster/chart/Chart.yaml b/charts/vcluster/Chart.yaml similarity index 100% rename from vcluster/chart/Chart.yaml rename to charts/vcluster/Chart.yaml diff --git a/vcluster/chart/templates/_helpers.tpl b/charts/vcluster/templates/_helpers.tpl similarity index 100% rename from vcluster/chart/templates/_helpers.tpl rename to charts/vcluster/templates/_helpers.tpl diff --git a/vcluster/chart/templates/allow-external-services.yaml b/charts/vcluster/templates/allow-external-services.yaml similarity index 100% rename from vcluster/chart/templates/allow-external-services.yaml rename to charts/vcluster/templates/allow-external-services.yaml diff --git a/vcluster/chart/templates/argo-cluster-connection.yaml b/charts/vcluster/templates/argo-cluster-connection.yaml similarity index 100% rename from vcluster/chart/templates/argo-cluster-connection.yaml rename to charts/vcluster/templates/argo-cluster-connection.yaml diff --git a/vcluster/chart/templates/cnpg.yaml b/charts/vcluster/templates/cnpg.yaml similarity index 100% rename from vcluster/chart/templates/cnpg.yaml rename to charts/vcluster/templates/cnpg.yaml diff --git a/vcluster/chart/templates/jaeger.yaml b/charts/vcluster/templates/jaeger.yaml similarity index 100% rename from vcluster/chart/templates/jaeger.yaml rename to charts/vcluster/templates/jaeger.yaml diff --git a/vcluster/chart/templates/kyverno-policies/allow-vcluster-apiserver.yaml b/charts/vcluster/templates/kyverno-policies/allow-vcluster-apiserver.yaml similarity index 100% rename from vcluster/chart/templates/kyverno-policies/allow-vcluster-apiserver.yaml rename to charts/vcluster/templates/kyverno-policies/allow-vcluster-apiserver.yaml diff --git a/vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml b/charts/vcluster/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml similarity index 100% rename from vcluster/chart/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml rename to charts/vcluster/templates/kyverno-policies/sync-vcluster-atlantis-secrets.yaml diff --git a/vcluster/chart/templates/kyverno-policies/sync-vcluster-oceanbox-regcred.yaml b/charts/vcluster/templates/kyverno-policies/sync-vcluster-oceanbox-regcred.yaml similarity index 100% rename from vcluster/chart/templates/kyverno-policies/sync-vcluster-oceanbox-regcred.yaml rename to charts/vcluster/templates/kyverno-policies/sync-vcluster-oceanbox-regcred.yaml diff --git a/vcluster/chart/templates/rbac.yaml b/charts/vcluster/templates/rbac.yaml similarity index 100% rename from vcluster/chart/templates/rbac.yaml rename to charts/vcluster/templates/rbac.yaml diff --git a/vcluster/chart/templates/vcluster.yaml b/charts/vcluster/templates/vcluster.yaml similarity index 100% rename from vcluster/chart/templates/vcluster.yaml rename to charts/vcluster/templates/vcluster.yaml diff --git a/vcluster/chart/values.yaml b/charts/vcluster/values.yaml similarity index 100% rename from vcluster/chart/values.yaml rename to charts/vcluster/values.yaml diff --git a/vcluster/create-vcluster.sh b/vcluster/create-vcluster.sh index b08c8013..39b16a83 100755 --- a/vcluster/create-vcluster.sh +++ b/vcluster/create-vcluster.sh @@ -5,11 +5,6 @@ if [ ! $# -ge 1 ]; then exit 1 fi -if [ ! -d chart ]; then - echo "error: must be run from toplevel directory" - exit 1 -fi - k='kubectl --context oceanbox' name=$1 @@ -20,7 +15,7 @@ yq ".clusters[]|select(.name|contains(\"$name-vcluster\")).name" ~/.kube/config if [ $? = 0 ]; then $k get ns $ns >/dev/null 2>&1 || $k create ns $ns - helm template -n $ns $@ $name ./chart | $k apply -f - + helm template -n $ns $@ $name oceanbox/vcluster | $k apply -f - echo "waiting for vcluster $name to appear... " while true; do