chore: rename HELM_VALUES to VCLUSTER_YAML

Author: johannesfrey

.github/workflows/e2e.yaml

@@ -114,7 +114,7 @@ jobs:
           export CLUSTER_NAME=vcluster-k3s
           export CLUSTER_NAMESPACE=vcluster-k3s
           export CHART_VERSION=0.20.0-beta.12
-          export HELM_VALUES=$(cat ./test/e2e/k3s-values.yaml | sed -z 's/\n/\\n/g')
+          export VCLUSTER_YAML=$(cat ./test/e2e/k3s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
 
@@ -131,7 +131,7 @@ jobs:
           export CLUSTER_NAMESPACE=vcluster-k0s
           export CHART_VERSION=0.20.0-beta.12
           export CHART_NAME=vcluster
-          export HELM_VALUES=$(cat ./test/e2e/k0s-values.yaml | sed -z 's/\n/\\n/g')
+          export VCLUSTER_YAML=$(cat ./test/e2e/k0s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
 
@@ -148,7 +148,7 @@ jobs:
           export CLUSTER_NAMESPACE=vcluster-k8s
           export CHART_VERSION=0.20.0-beta.12
           export CHART_NAME=vcluster
-          export HELM_VALUES=$(cat ./test/e2e/k8s-values.yaml | sed -z 's/\n/\\n/g')
+          export VCLUSTER_YAML=$(cat ./test/e2e/k8s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
 
@@ -165,7 +165,7 @@ jobs:
           export CLUSTER_NAMESPACE=vcluster-eks
           export CHART_VERSION=0.20.0-beta.12
           export CHART_NAME=vcluster
-          export HELM_VALUES=$(cat ./test/e2e/eks-values.yaml | sed -z 's/\n/\\n/g')
+          export VCLUSTER_YAML=$(cat ./test/e2e/eks-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
 

README.md

@@ -21,13 +21,13 @@ clusterctl init --infrastructure vcluster
 
 Next you will generate a manifest file for a vcluster instance and create it in the management cluster.
 Cluster instance is configured using clusterctl parameters and environment variables - CHART_NAME, CHART_REPO, CHART_VERSION, VCLUSTER_HOST and VCLUSTER_PORT.
-In the example commands below, the HELM_VALUES variable will be populated with the contents of the `values.yaml` file.
+In the example commands below, the VCLUSTER_YAML variable will be populated with the contents of the `values.yaml` file.
 ```shell
 export CLUSTER_NAME=vcluster
 export CLUSTER_NAMESPACE=vcluster
-export HELM_VALUES=""
+export VCLUSTER_YAML=""
 # Uncomment if you want to use vcluster values
-# export HELM_VALUES=$(cat devvalues.yaml | awk '{printf "%s\\n", $0}')
+# export VCLUSTER_YAML=$(cat devvalues.yaml | awk '{printf "%s\\n", $0}')
 kubectl create namespace ${CLUSTER_NAMESPACE}
 clusterctl generate cluster ${CLUSTER_NAME} \
     --infrastructure vcluster \
@@ -161,13 +161,13 @@ go run -mod vendor main.go
 
 Next, in a separate terminal you will generate a manifest file for a vcluster instance.
 Cluster instance is configured from a template file using environment variables - CLUSTER_NAME, CHART_NAME, CHART_REPO, CHART_VERSION, VCLUSTER_HOST and VCLUSTER_PORT. Only the CHART_VERSION and CLUSTER_NAME variables are mandatory.
-In the example commands below, the HELM_VALUES variable will be populated with the contents of the `devvalues.yaml` file, don't forget to re-run the `export HELM_VALUES...` command when the `devvalues.yaml` changes.
+In the example commands below, the VCLUSTER_YAML variable will be populated with the contents of the `devvalues.yaml` file, don't forget to re-run the `export VCLUSTER_YAML...` command when the `devvalues.yaml` changes.
 ```shell
 export CLUSTER_NAME=test
 export CLUSTER_NAMESPACE=test
 export CHART_VERSION=0.20.0
 export CHART_NAME=vcluster
-export HELM_VALUES=$(cat devvalues.yaml | awk '{printf "%s\\n", $0}')
+export VCLUSTER_YAML=$(cat devvalues.yaml | awk '{printf "%s\\n", $0}')
 kubectl create namespace ${CLUSTER_NAMESPACE}
 cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
 ```
@@ -192,7 +192,7 @@ export CHART_VERSION=0.20.0
 
 ## Specifying custom values for virtual clusters
 
-Depending on your needs, you might want to let CAPVC create a virtual cluster accordingly by e.g. settings those values in a corresponding file that is fed to the `HELM_VALUES` environment variable.
+Depending on your needs, you might want to let CAPVC create a virtual cluster accordingly by e.g. settings those values in a corresponding file that is fed to the `VCLUSTER_YAML` environment variable.
 
 Example:
 
@@ -208,7 +208,7 @@ controlPlane:
         enabled: true
 EOF
 
-export HELM_VALUES=$(cat /tmp/values.yaml | awk '{printf "%s\\n", $0}')
+export VCLUSTER_YAML=$(cat /tmp/values.yaml | awk '{printf "%s\\n", $0}')
 ```
 
 For all possible values please see the [official docs](https://www.vcluster.com/docs/vcluster/configure/vcluster-yaml/).

config/default/manager_image_patch.yaml-e

@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      # Change the value of image field below to your controller image URL
+      - image: docker.io/loftsh/cluster-api-provider-vcluster:main
+        name: manager

config/default/manager_pull_policy_patch.yaml-e

@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      - name: manager
+        imagePullPolicy: Always

config/rbac/provider_role_binding.yaml-e

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ${CLUSTER_ROLE:=cluster-admin}
+subjects:
+- kind: ServiceAccount
+  name: controller-manager
+  namespace: system

docs/quick-start.md

@@ -62,7 +62,7 @@ Next we will create our virtual cluster within our `kind` cluster.
 ```shell
 export CLUSTER_NAME=kind
 export CLUSTER_NAMESPACE=vcluster
-export HELM_VALUES=""
+export VCLUSTER_YAML=""
 
 kubectl create namespace ${CLUSTER_NAMESPACE}
 clusterctl generate cluster ${CLUSTER_NAME} \

templates/cluster-template.yaml

@@ -18,7 +18,7 @@ metadata:
   name: ${CLUSTER_NAME}
 spec:
   helmRelease:
-    values: "${HELM_VALUES:=}"
+    values: "${VCLUSTER_YAML:=}"
     chart: 
       name: ${CHART_NAME:=vcluster}
       repo: ${CHART_REPO:=https://charts.loft.sh}