From e3f6aa5fbd34f2be27cd3a2dd63d798a1ca0b724 Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Mon, 16 Aug 2021 14:49:04 -0700 Subject: Use EMCO logical cloud with addons The moves the addons from the default namespace into their own, "kud" namespace. Issue-ID: MULTICLOUD-1324 Signed-off-by: Todd Malsbary Change-Id: I5476c7634af7affe1b6bbd7d2bf9b5cd7a8206e5 --- kud/deployment_infra/emco/examples/02-project.yaml | 52 ++++++++++++++++++++-- .../emco/examples/values.yaml.example | 2 +- .../containerized/addons/values.yaml.tmpl | 2 +- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/kud/deployment_infra/emco/examples/02-project.yaml b/kud/deployment_infra/emco/examples/02-project.yaml index 98ecfdb4..d62a4f65 100644 --- a/kud/deployment_infra/emco/examples/02-project.yaml +++ b/kud/deployment_infra/emco/examples/02-project.yaml @@ -7,17 +7,63 @@ version: emco/v2 resourceContext: anchor: projects metadata : - name: {{ .ProjectName }} + name: {{ .ProjectName }} --- -#create default logical cloud with admin permissions +#create privileged logical cloud version: emco/v2 resourceContext: anchor: projects/{{ .ProjectName }}/logical-clouds metadata: name: {{ .LogicalCloud }} spec: - level: "0" + namespace: {{ .LogicalCloud }} + user: + user-name: {{ .LogicalCloud }}-admin + type: certificate + +--- +#create cluster quotas +version: emco/v2 +resourceContext: + anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/cluster-quotas +metadata: + name: quota +spec: + #an empty spec means that the addons will not be required to specify + #cpu, memory, etc. limits + +--- +#add namespaced permissions +version: emco/v2 +resourceContext: + anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/user-permissions +metadata: + name: namespaced +spec: + namespace: {{ .LogicalCloud }} + apiGroups: + - "*" + resources: + - "*" + verbs: + - "*" + +--- +#add non-namespaced permissions +version: emco/v2 +resourceContext: + anchor: projects/{{ .ProjectName }}/logical-clouds/{{ .LogicalCloud }}/user-permissions +metadata: + name: non-namespaced +spec: + namespace: "" + apiGroups: + - "*" + resources: + - "*" + verbs: + - "*" {{- range $index, $cluster := .Clusters }} --- diff --git a/kud/deployment_infra/emco/examples/values.yaml.example b/kud/deployment_infra/emco/examples/values.yaml.example index 8c4b6c30..67944eb8 100644 --- a/kud/deployment_infra/emco/examples/values.yaml.example +++ b/kud/deployment_infra/emco/examples/values.yaml.example @@ -11,7 +11,7 @@ Clusters: Name: cluster ProjectName: kud -LogicalCloud: default +LogicalCloud: kud PackagesPath: $PWD/../output/packages AddonsApp: addons diff --git a/kud/hosting_providers/containerized/addons/values.yaml.tmpl b/kud/hosting_providers/containerized/addons/values.yaml.tmpl index f2a20f84..b3e5845c 100644 --- a/kud/hosting_providers/containerized/addons/values.yaml.tmpl +++ b/kud/hosting_providers/containerized/addons/values.yaml.tmpl @@ -11,7 +11,7 @@ Clusters: Name: cluster ProjectName: kud -LogicalCloud: default +LogicalCloud: kud PackagesPath: ${PACKAGES_PATH} AddonsApp: addons -- cgit 1.2.3-korg