chore(demo-env): Fix resource tree and redis (#118)

Signed-off-by: jannfis <[email protected]>

Author: jannfis

hack/demo-env/README.md

@@ -8,7 +8,7 @@ This directory and sub-directories contain scripts, kustomize manifests and othe
 
 The scripts are targeting the author's development system. Do not run them against yours or be prepared to dive into undocumented configuration and to clean up after yourself.
 
-It uses `vcluster` to create three virtual clusters:
+It uses [vcluster](https://github.com/loft-sh/vcluster) to create three virtual clusters:
 
 * vcluster-control-plane - For hosting the control plane and principal
 * vcluster-agent-managed - A cluster with agent in managed mode
@@ -20,6 +20,8 @@ Both, vclusters and Argo CD installations, will require that LoadBalancer functi
 
 ## Set up
 
+Make sure you have administrative access to a cluster and [vcluster](https://github.com/loft-sh/vcluster) is installed on your machine and within your `$PATH`. 
+
 To setup, run
 
 ```

hack/demo-env/agent-managed/argocd-cmd-params-cm.yaml

@@ -5,3 +5,4 @@ metadata:
 data:
   repo.server: 192.168.56.222:8081
   redis.server: 192.168.56.221:6379
+  application.namespaces: agent-managed

hack/demo-env/agent-managed/kustomization.yaml

@@ -9,4 +9,4 @@ resources:
 
 patches:
 - path: argocd-cmd-params-cm.yaml
-- path: argocd-secret.yaml
+- path: argocd-secret.yaml

hack/demo-env/common/kustomization.yaml

@@ -1,2 +1,3 @@
 resources:
 - default-project.yaml
+- redis-secret.yaml

hack/demo-env/common/redis-secret.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+data:
+  auth: a3BReU5ZLWpjaGU3RUJ1Vw==
+kind: Secret
+metadata:
+  name: argocd-redis
+type: Opaque

hack/demo-env/setup-vcluster-env.sh

@@ -2,7 +2,7 @@
 set -e
 set -o pipefail
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-VCLUSTERS="control-plane agent-managed agent-autonomous"
+VCLUSTERS="control-plane:argocd agent-managed:argocd agent-autonomous:argocd"
 action="$1"
 
 # Kubectl context to restore to
@@ -12,23 +12,35 @@ cleanup() {
 	kubectl config set-context ${context}
 }
 
+cluster() {
+	IFS=":" s=($1); echo ${s[0]}
+}
+
+namespace() {
+	IFS=":" s=($1); echo ${s[1]}
+}
+
 trap cleanup EXIT ERR
 
 apply() {
 	echo "-> Creating Argo CD instances in vclusters"
-	for cluster in $VCLUSTERS; do
+	for c in $VCLUSTERS; do
+		cluster=$(cluster $c)
+		namespace=$(namespace $c)
 		echo "  --> Creating instance in vcluster $cluster"
-		kubectl --context vcluster-${cluster} create ns argocd || true
-		kubectl --context vcluster-${cluster} apply -n argocd -k ${SCRIPTPATH}/${cluster}
+		kubectl --context vcluster-$cluster create ns $namespace || true
+		kubectl --context vcluster-$cluster apply -n $namespace -k ${SCRIPTPATH}/${cluster}
 	done
 	kubectl --context vcluster-control-plane create ns agent-autonomous || true
 	kubectl --context vcluster-control-plane create ns agent-managed || true
+	kubectl --context vcluster-agent-managed create ns agent-managed || true
 }
 
 case "$action" in
 create)
 	echo "-> Creating required vclusters"
-	for cluster in $VCLUSTERS; do
+	for c in $VCLUSTERS; do
+		cluster=$(cluster $c)
 		echo "  --> Creating vcluster $cluster"
 		vcluster create --context=default -n vcluster-${cluster} --expose --kube-config-context-name vcluster-${cluster} vcluster-${cluster}
 	done
@@ -40,7 +52,8 @@ apply)
 	;;
 delete)
 	echo "-> Deleting vclusters"
-	for cluster in $VCLUSTERS; do
+	for c in $VCLUSTERS; do
+		cluster=$(cluster $c)
 		echo "  --> Deleting vcluster $cluster"
 		vcluster delete --context=default vcluster-${cluster} || true
 	done

hack/demo-env/start-agent-managed.sh

@@ -6,4 +6,4 @@ if ! kubectl config get-contexts | tail -n +2 | awk '{ print $2 }' | grep -qE '^
 fi
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 test -f cmd/agent/main.go || (echo "Script should be run from argocd-agent's root path" >&2; exit 1)
-go run ./cmd/agent/main.go --agent-mode managed --creds userpass:${SCRIPTPATH}/creds/creds.agent-managed --server-address 127.0.0.1 --server-port 8443 --insecure-tls --kubecontext vcluster-agent-managed --namespace argocd
+go run ./cmd/agent/main.go --agent-mode managed --creds userpass:${SCRIPTPATH}/creds/creds.agent-managed --server-address 127.0.0.1 --server-port 8443 --insecure-tls --kubecontext vcluster-agent-managed --namespace agent-managed