summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-03-29 12:03:09 -0400
committerMike Elliott <mike.elliott@amdocs.com>2018-04-03 08:38:34 -0400
commit91e48718835b3022a2c7718eb0b64e3d9dda1736 (patch)
treeeeec9d9e852f2453467fb888c4eba9058e580bd6
parent95dd46311f15e3d004e821496e135e7b43faee4e (diff)
Remove global repository from onap chart
See description in linked issue id. Change-Id: I3bcec1214875cb318dc45162013aec8957443dc8 Issue-ID: OOM-845 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
-rw-r--r--kubernetes/helm/starters/onap-app/values.yaml1
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml26
-rw-r--r--kubernetes/onap/resources/environments/disable-allcharts.yaml73
-rw-r--r--kubernetes/onap/values.yaml26
4 files changed, 104 insertions, 22 deletions
diff --git a/kubernetes/helm/starters/onap-app/values.yaml b/kubernetes/helm/starters/onap-app/values.yaml
index 60b4682c5e..2e0d7b7762 100644
--- a/kubernetes/helm/starters/onap-app/values.yaml
+++ b/kubernetes/helm/starters/onap-app/values.yaml
@@ -17,6 +17,7 @@
#################################################################
global:
nodePortPrefix: 302
+ repository: nexus3.onap.org:10001
repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
readinessRepository: oomk8s
readinessImage: readiness-check:1.0.0
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 308c7ca647..61a7546db0 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -23,12 +23,17 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
- # image repositories
- repository: nexus3.onap.org:10001
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- # readiness check
+ # ONAP Repository
+ # Uncomment the following to enable the use of a single docker
+ # repository but ONLY if your repository mirrors all ONAP
+ # docker images. This includes all images from dockerhub and
+ # any other repository that hosts images for ONAP components.
+ #repository: nexus3.onap.org:10001
+ #repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
+
+ # readiness check - temporary repo until images migrated to nexus3
readinessRepository: oomk8s
- # logging agent
+ # logging agent - temporary repo until images migrated to nexus3
loggingRepository: docker.elastic.co
# image pull policy
@@ -56,7 +61,7 @@ clamp:
enabled: true
cli:
enabled: false
-consul: # Consul Health Check Monitoring
+consul:
enabled: false
dcaegen2:
enabled: false
@@ -76,18 +81,17 @@ policy:
enabled: false
portal:
enabled: false
-robot: # Robot Health Check
+robot:
enabled: true
sdc:
enabled: false
sdnc:
enabled: false
-
+
dmaap-listener:
config:
- dmaapPort: 3904
-
-so: # Service Orchestrator
+ dmaapPort: 3904
+so:
enabled: true
replicaCount: 1
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
new file mode 100644
index 0000000000..7e27a316cb
--- /dev/null
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -0,0 +1,73 @@
+# 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.
+
+
+# This override file is useful to test one or more subcharts.
+# It overrides the default ONAP parent chart behaviour to deploy
+# all of ONAP.
+#
+# Example use to enable a single subchart (from this directory):
+#
+# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
+
+#################################################################
+# Enable/disable and configure helm charts (ie. applications)
+# to customize the ONAP deployment.
+#################################################################
+aaf:
+ enabled: false
+aai:
+ enabled: false
+appc:
+ enabled: false
+clamp:
+ enabled: false
+cli:
+ enabled: false
+consul:
+ 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:
+ enabled: false
+sdc:
+ enabled: false
+sdnc:
+ enabled: false
+so:
+ enabled: false
+uui:
+ enabled: false
+vfc:
+ enabled: false
+vid:
+ enabled: false
+vnfsdk:
+ enabled: false \ No newline at end of file
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index c4a73c8a96..06c8ec5cdd 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -23,12 +23,17 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
- # image repositories
- repository: nexus3.onap.org:10001
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- # readiness check
+ # ONAP Repository
+ # Uncomment the following to enable the use of a single docker
+ # repository but ONLY if your repository mirrors all ONAP
+ # docker images. This includes all images from dockerhub and
+ # any other repository that hosts images for ONAP components.
+ #repository: nexus3.onap.org:10001
+ #repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
+
+ # readiness check - temporary repo until images migrated to nexus3
readinessRepository: oomk8s
- # logging agent
+ # logging agent - temporary repo until images migrated to nexus3
loggingRepository: docker.elastic.co
# image pull policy
@@ -57,13 +62,13 @@ clamp:
enabled: true
cli:
enabled: true
-consul: # Consul Health Check Monitoring
+consul:
enabled: true
dcaegen2:
enabled: true
esr:
enabled: true
-log: # ONAP Logging ElasticStack
+log:
enabled: true
message-router:
enabled: true
@@ -77,7 +82,7 @@ policy:
enabled: true
portal:
enabled: true
-robot: # Robot Health Check
+robot:
enabled: true
sdc:
enabled: true
@@ -86,9 +91,8 @@ sdnc:
dmaap-listener:
config:
- dmaapPort: 3904
-
-so: # Service Orchestrator
+ dmaapPort: 3904
+so:
enabled: true
replicaCount: 1