aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc/charts/sdnc-portal
diff options
context:
space:
mode:
authorjmac <james.macnider@amdocs.com>2018-05-10 22:44:19 +0000
committerjmac <james.macnider@amdocs.com>2018-05-11 14:23:48 +0000
commita68f4cb5db47f41deac439b9ef90065e023af3fe (patch)
tree2aa0ac20a039f901a029ef2570c1b1a8977b102d /kubernetes/sdnc/charts/sdnc-portal
parent463c20ba29c4d6723c0a176967b492d1d28196ae (diff)
General cleanup of SDNC charts
Addressing issues like: - missing property files - hard-coded ports - hard-coded ODL passwords - improper configMap mounts - incorrect service names Change-Id: I74726ffedbfc20e164a814ca8777a699b92b3d65 Signed-off-by: jmac <james.macnider@amdocs.com> Issue-ID: SDNC-310
Diffstat (limited to 'kubernetes/sdnc/charts/sdnc-portal')
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties32
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb015
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml22
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/values.yaml12
6 files changed, 61 insertions, 14 deletions
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
index 3e873214b4..f6d202ef09 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json
@@ -44,7 +44,7 @@
"odlPort": "8181",
"odlConexusPort": "8181",
"odlUser": "admin",
- "odlPasswd": "admin",
+ "odlPasswd": "{{.Values.config.odlPassword}}",
"ConexusNetwork_sslCert": "",
"ConexusNetwork_sslKey": "",
"AppNetwork_sslCert": "",
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties b/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties
new file mode 100644
index 0000000000..9e4c88a879
--- /dev/null
+++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties
@@ -0,0 +1,32 @@
+###
+# ============LICENSE_START=======================================================
+# Copyright (C) 2018 ONAP Intellectual Property. All rights
+# reserved.
+# ================================================================================
+# 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.
+# ============LICENSE_END=========================================================
+###
+org.onap.ccsdk.sli.dbtype=jdbc
+org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
+org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://{{.Values.mysql.service.name}}.{{.Release.Namespace}}:{{.Values.mysql.service.internalPort}}/sdnctl
+org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
+org.onap.ccsdk.sli.jdbc.database=sdnctl
+org.onap.ccsdk.sli.jdbc.user=sdnctl
+org.onap.ccsdk.sli.jdbc.password=gamma
+org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01
+org.onap.ccsdk.sli.jdbc.connection.timeout=50
+org.onap.ccsdk.sli.jdbc.request.timeout=100
+org.onap.ccsdk.sli.jdbc.limit.init=10
+org.onap.ccsdk.sli.jdbc.limit.min=10
+org.onap.ccsdk.sli.jdbc.limit.max=20
+org.onap.dblib.connection.recovery=false
diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01
deleted file mode 100644
index e0e3295735..0000000000
--- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01
+++ /dev/null
@@ -1,5 +0,0 @@
-org.openecomp.sdnctl.sli.dbtype = jdbc
-org.openecomp.sdnctl.sli.jdbc.url = jdbc:mysql://sdnc-sdnctldb01:3306/sdnctl
-org.openecomp.sdnctl.sli.jdbc.database = sdnctl
-org.openecomp.sdnctl.sli.jdbc.user = sdnctl
-org.openecomp.sdnctl.sli.jdbc.password = gamma \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
index fe08a96b39..f57dc78107 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/configmap.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-portal
+ name: {{ include "common.fullname" . }}
namespace: {{ include "common.namespace" . }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
index b456d8ee91..87ed6aa283 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
@@ -81,8 +81,21 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: {{ .Values.config.configDir }}
- name: {{ include "common.fullname" . }}-portal
+ - mountPath: {{ .Values.config.configDir }}/admportal.json
+ name: properties
+ subPath: admportal.json
+ - mountPath: {{ .Values.config.configDir }}/dblib.properties
+ name: properties
+ subPath: dblib.properties
+ - mountPath: {{ .Values.config.configDir }}/svclogic.properties
+ name: properties
+ subPath: svclogic.properties
+ - mountPath: {{ .Values.config.configDir }}/svclogic.properties.sdnctldb01
+ name: properties
+ subPath: svclogic.properties
+ - mountPath: {{ .Values.config.configDir }}/svclogic.properties.sdnctldb02
+ name: properties
+ subPath: svclogic.properties.sdnctldb02
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -97,8 +110,9 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: {{ include "common.fullname" . }}-portal
+ - name: properties
configMap:
- name: {{ include "common.fullname" . }}-portal
+ name: {{ include "common.fullname" . }}
+ defaultMode: 0644
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index c2f763add4..f5cd48c12f 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -35,10 +35,11 @@ debugEnabled: false
# application configuration
config:
- mysqlChartName: sdnc-dbhost
+ mysqlChartName: sdnc-db
dbRootPassword: openECOMP1.0
sdncChartName: sdnc
configDir: /opt/onap/sdnc/data/properties
+ odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
# default number of instances
replicaCount: 1
@@ -49,14 +50,14 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
service:
@@ -70,6 +71,11 @@ service:
ingress:
enabled: false
+mysql:
+ service:
+ name: sdnc-dbhost
+ internalPort: 3306
+
resources: {}
#resources:
# limits: