PR feedback

On-behalf-of: @SAP christoph.mewes@sap.com

Author: xrstf

charts/init-agent/templates/configcluster/crds.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.configCluster.crds.create }}
+{{- if and (has "configcluster" .Values.targets) .Values.configCluster.crds.create }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

charts/init-agent/templates/configcluster/rbac.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.target "configcluster" }}
+{{- if has "configcluster" .Values.targets }}
 {{- if .Values.leaderElection.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

charts/init-agent/templates/host/deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.target "" }}
+{{- if or (not .Values.targets) (has "host" .Values.targets) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/init-agent/templates/wstcluster/rbac.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.target "wstcluster" }}
+{{- if has "wstcluster" .Values.targets }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

charts/init-agent/tests/combined.yaml

@@ -0,0 +1,6 @@
+kcpKubeconfig: kcp-kubeconfig
+configWorkspace: root:init-agent
+targets:
+  - host
+  - configcluster
+  - wstcluster

charts/init-agent/tests/configcluster.yaml

@@ -1,3 +1,4 @@
 kcpKubeconfig: kcp-kubeconfig
 configWorkspace: root:init-agent
-target: configcluster
+targets:
+  - configcluster

charts/init-agent/tests/wstcluster.yaml

@@ -1,3 +1,4 @@
 kcpKubeconfig: kcp-kubeconfig
 configWorkspace: root:init-agent
-target: wstcluster
+targets:
+  - wstcluster

charts/init-agent/values.yaml

@@ -1,23 +1,28 @@
 #
 # Welcome to the kcp Init Agent!
 #
-# This Helm chart can be rendered in 3 different variations:
+# This Helm chart can be rendered in 3 different variations, controlled by the
+# "targets" list:
 #
-#   * By default, it will output a Deployment and necessary auxiliary resources
-#     to *run* the init-agent in Kubernetes. Use this to "install" the agent.
-#     For this, configure Helm with a kubeconfig that points to the hosting
-#     Kubernetes cluster.
-#   * By setting "target=configcluster", the chart will output the Init Agent
-#     CRDs, suitable to bootstrap a kcp workspace to create InitTargets and
-#     InitTemplates in kcp, plus the necessary RBAC for it.
+#   * By default (targets is empty) or by including "host" in targets, it will
+#     output a Deployment and necessary auxiliary resources to *run* the
+#     init-agent in Kubernetes. Use this to "install" the agent. For this,
+#     configure Helm with a kubeconfig that points to the hosting Kubernetes
+#     cluster.
+#   * By including "configcluster" in targets, the chart will output the Init
+#     Agent CRDs, suitable to bootstrap a kcp workspace to create InitTargets
+#     and InitTemplates in kcp, plus the necessary RBAC for it.
 #     For this, Helm needs to be configured with a kubeconfig that points to
 #     the desired config workspace.
-#   * By setting "target=wstcluster", the chart will only output the necessary
-#     RBAC to allow the agent to access WorkspaceTypes and to initialize them
-#     in a single workspace. This variation has to be installed in each workspace
-#     for which InitTargets are configured in the configWorkspace.
-#     For this, Helm needs to be configured with a kubeconfig that points to
-#     the desired workspace.
+#   * By including "wstcluster" in targets, the chart will only output the
+#     necessary RBAC to allow the agent to access WorkspaceTypes and to
+#     initialize them in a single workspace. This variation has to be installed
+#     in each workspace for which InitTargets are configured in the
+#     configWorkspace. For this, Helm needs to be configured with a kubeconfig
+#     that points to the desired workspace.
+#
+# Multiple targets can be combined (e.g. ["configcluster", "wstcluster"]) to
+# output manifests for several targets at once.
 #
 # All three modes must be installed for the init-agent to function correctly.
 #
@@ -28,9 +33,10 @@ leaderElection:
   enabled: true
   namespace: kcp-init-agent
 
-# Required: set to "" (default, hosting cluster), "configcluster" or "wstcluster"
-# (see comment above) to output the correct manifests for each Kubernetes endpoint.
-target: ""
+# Set to one or more of "host", "configcluster" and "wstcluster" (see comment
+# above) to output the correct manifests for each Kubernetes endpoint. Leave
+# empty (default) to output the hosting cluster manifests (Deployment etc.).
+targets: []
 
 # Configuration exclusively for all the clusters (workspaces) in which the
 # init-agent is meant to read and initialize WorkspaceTypes in. The chart needs