diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/onap/requirements.yaml | 39 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml (renamed from kubernetes/onap/resources/environments/onap-demo.yaml) | 69 | ||||
| -rw-r--r-- | kubernetes/onap/templates/clusterrolebinding.yaml | 32 | ||||
| -rw-r--r-- | kubernetes/onap/templates/secrets.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/onap/values.yaml | 63 |
6 files changed, 200 insertions, 44 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index db8a30f28e..1050e1a38b 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -1,3 +1,17 @@ +# 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 name: onap version: 2.0.0 diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 8f123128ad..b98096b22b 100644 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -1,3 +1,17 @@ +# 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. + # Referencing a named repo called 'local'. # Can add this repo by running commands like: # > helm serve @@ -8,21 +22,24 @@ dependencies: repository: '@local' condition: aaf.enabled - name: aai - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: aai.enabled - name: appc - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: appc.enabled - name: clamp - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: clamp.enabled - name: cli version: ~0.1.0 repository: '@local' condition: cli.enabled + - name: common + version: ~2.0.0 + repository: '@local' - name: consul version: ~1.1.0 repository: '@local' @@ -32,15 +49,11 @@ dependencies: repository: '@local' condition: dcaegen2.enabled - name: esr - version: ~1.1.0 + version: ~2.0.0 repository: '@local' condition: esr.enabled - - name: kube2msb - version: ~0.1.0 - repository: '@local' - condition: kube2msb.enabled - name: log - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: log.enabled - name: message-router @@ -52,7 +65,7 @@ dependencies: repository: '@local' condition: mock.enabled - name: msb - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: msb.enabled - name: multicloud @@ -68,7 +81,7 @@ dependencies: repository: '@local' condition: portal.enabled - name: robot - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: robot.enabled - name: sdc @@ -92,10 +105,10 @@ dependencies: repository: '@local' condition: vfc.enabled - name: vid - version: ~0.1.0 + version: ~2.0.0 repository: '@local' condition: vid.enabled - name: vnfsdk version: ~1.1.0 repository: '@local' - condition: vnfsdk.enabled
\ No newline at end of file + condition: vnfsdk.enabled diff --git a/kubernetes/onap/resources/environments/onap-demo.yaml b/kubernetes/onap/resources/environments/dev.yaml index 67b6f401a4..8bbaa279e8 100644 --- a/kubernetes/onap/resources/environments/onap-demo.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -1,3 +1,17 @@ +# 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. + ################################################################# # Global configuration overrides. # @@ -23,7 +37,7 @@ global: # override default mount path root directory # referenced by persistent volumes and log files persistence: - mountPath: /dockerdata-nfs + mountPath: /dockerdata # flag to enable debugging - application support required debugEnabled: true @@ -32,17 +46,52 @@ global: # Enable/disable and configure helm charts (ie. applications) # to customize the ONAP deployment. ################################################################# -consul: +aaf: + enabled: false +aai: + enabled: false +appc: + enabled: false +clamp: enabled: true - -so: +cli: + enabled: false +consul: # Consul Health Check Monitoring + enabled: false +dcaegen2: + enabled: false +esr: + enabled: false +log: + enabled: false +message-router: + enabled: false +mock: + enabled: false +msb: + enabled: false +multicloud: + enabled: false +policy: + enabled: false +portal: + enabled: false +robot: # Robot Health Check enabled: true +sdc: + enabled: false +sdnc: + enabled: false +so: # Service Orchestrator + enabled: true + replicaCount: 1 + liveness: # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true - + # so server configuration config: # message router configuration @@ -57,4 +106,12 @@ so: # configure embedded mariadb mariadb: config: - mariadbRootPassword: password
\ No newline at end of file + mariadbRootPassword: password +uui: + enabled: false +vfc: + enabled: false +vid: + enabled: false +vnfsdk: + enabled: false
\ No newline at end of file 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 diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 5340c95f57..ee7d00b441 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -1,3 +1,17 @@ +# 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. + ################################################################# # Global configuration overrides. # @@ -28,48 +42,47 @@ global: # flag to enable debugging - application support required debugEnabled: false + ################################################################# # Enable/disable and configure helm charts (ie. applications) # to customize the ONAP deployment. ################################################################# aaf: - enabled: false + enabled: true aai: - enabled: false + enabled: true appc: - enabled: false + enabled: true clamp: - enabled: false + enabled: true cli: - enabled: false + enabled: true consul: # Consul Health Check Monitoring - enabled: false + enabled: true dcaegen2: - enabled: false + enabled: true esr: - enabled: false -kube2msb: - enabled: false -log: - enabled: false + enabled: true +log: # ONAP Logging ElasticStack + enabled: true message-router: - enabled: false + enabled: true mock: - enabled: false + enabled: true msb: - enabled: false + enabled: true multicloud: - enabled: false + enabled: true policy: - enabled: false + enabled: true portal: - enabled: false + enabled: true robot: # Robot Health Check - enabled: false + enabled: true sdc: - enabled: false + enabled: true sdnc: - enabled: false + enabled: true so: # Service Orchestrator enabled: true @@ -96,10 +109,10 @@ so: # Service Orchestrator config: mariadbRootPassword: password uui: - enabled: false + enabled: true vfc: - enabled: false + enabled: true vid: - enabled: false + enabled: true vnfsdk: - enabled: false
\ No newline at end of file + enabled: true |