summaryrefslogtreecommitdiffstats
path: root/kubernetes/onap
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-03-21 11:40:36 -0400
committerMike Elliott <mike.elliott@amdocs.com>2018-03-22 12:48:32 -0400
commit98dde550955c6f4c24d5c5ebab82cac082769bba (patch)
treea1e27c4640207fbeea2fab4c014bc1c679fc1486 /kubernetes/onap
parent38692ad900baf554896b07ce04f475fb3c621b25 (diff)
Move deployment-specific templates to parent chart
This change provides a single centralized location (onap parent chart) to change/install secrets, persistent volumes, service account(s), RBAC and configuration overrides. It also eliminates the need for a 2-step install of setup and application charts. Users would customize the onap parent chart to install both the deployment-specific resources and one or more "enabled" sub charts, using a command like the following: helm install local/onap -f dev.yaml where dev.yaml (or prod.yaml, etc.) provides the customization of application subcharts to deploy. Change-Id: Idbef28ffa404ea35922a4c3994605bdc27f3471e Issue-ID: OOM-817 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Diffstat (limited to 'kubernetes/onap')
-rw-r--r--kubernetes/onap/requirements.yaml3
-rw-r--r--kubernetes/onap/templates/clusterrolebinding.yaml32
-rw-r--r--kubernetes/onap/templates/secrets.yaml27
3 files changed, 59 insertions, 3 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 1b5ca64b13..7b5e56b070 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -92,9 +92,6 @@ dependencies:
version: ~0.1.0
repository: '@local'
condition: sdnc.enabled
- - name: setup
- version: ~2.0.0
- repository: '@local'
- name: so
version: ~2.0.0
repository: '@local'
diff --git a/kubernetes/onap/templates/clusterrolebinding.yaml b/kubernetes/onap/templates/clusterrolebinding.yaml
new file mode 100644
index 0000000000..fbe9a5b0a7
--- /dev/null
+++ b/kubernetes/onap/templates/clusterrolebinding.yaml
@@ -0,0 +1,32 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+ name: {{ include "common.namespace" . }}-binding
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: cluster-admin
+subjects:
+ - kind: ServiceAccount
+ name: default
+ namespace: {{ include "common.namespace" . }} \ No newline at end of file
diff --git a/kubernetes/onap/templates/secrets.yaml b/kubernetes/onap/templates/secrets.yaml
new file mode 100644
index 0000000000..2345be1972
--- /dev/null
+++ b/kubernetes/onap/templates/secrets.yaml
@@ -0,0 +1,27 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "common.namespace" . }}-docker-registry-key
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+ .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }}
+type: kubernetes.io/dockercfg \ No newline at end of file