summaryrefslogtreecommitdiffstats
path: root/kubernetes/onap
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/onap')
-rw-r--r--kubernetes/onap/requirements.yaml9
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml (renamed from kubernetes/onap/resources/environments/onap-demo.yaml)55
-rw-r--r--kubernetes/onap/templates/clusterrolebinding.yaml32
-rw-r--r--kubernetes/onap/templates/secrets.yaml27
-rw-r--r--kubernetes/onap/values.yaml42
5 files changed, 132 insertions, 33 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 1b5ca64b13..0b511503b9 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -26,11 +26,11 @@ dependencies:
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
@@ -49,7 +49,7 @@ dependencies:
repository: '@local'
condition: dcaegen2.enabled
- name: esr
- version: ~1.1.0
+ version: ~1.0.0
repository: '@local'
condition: esr.enabled
- name: log
@@ -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/resources/environments/onap-demo.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 2748c3179e..8bbaa279e8 100644
--- a/kubernetes/onap/resources/environments/onap-demo.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -37,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
@@ -46,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
@@ -71,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 be4d132b7e..0c3ff8526d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -48,41 +48,41 @@ global:
# 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
+ enabled: true
log:
- enabled: false
+ 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: true
sdc:
- enabled: false
+ enabled: true
sdnc:
- enabled: false
+ enabled: true
so: # Service Orchestrator
enabled: true
@@ -109,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
+ enabled: true