aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/templates/all-services.yaml5
-rw-r--r--kubernetes/sdnc/templates/dgbuilder-deployment.yaml4
-rw-r--r--kubernetes/sdnc/templates/sdnc-deployment.yaml35
-rw-r--r--kubernetes/sdnc/templates/web-deployment.yaml14
-rw-r--r--kubernetes/sdnc/values.yaml7
5 files changed, 52 insertions, 13 deletions
diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml
index 7223dfdcd7..687a6bb934 100644
--- a/kubernetes/sdnc/templates/all-services.yaml
+++ b/kubernetes/sdnc/templates/all-services.yaml
@@ -78,10 +78,13 @@ metadata:
]'
spec:
ports:
- - name: "sdnc-port"
+ - name: "sdnc-port-8181"
port: 8282
targetPort: 8181
nodePort: {{ .Values.nodePortPrefix }}02
+ - name: "sdnc-port-8101"
+ port: 8201
+ targetPort: 8101
type: NodePort
selector:
app: sdnc
diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
index ba2008ab4a..0e2166e92a 100644
--- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
@@ -45,12 +45,12 @@ spec:
- command:
- /bin/bash
- -c
- - cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait
+ - cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait
env:
- name: MYSQL_ROOT_PASSWORD
value: openECOMP1.0
- name: SDNC_CONFIG_DIR
- value: /opt/openecomp/sdnc/data/properties
+ value: /opt/onap/sdnc/data/properties
image: {{ .Values.image.dgbuilderSdnc }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: sdnc-dgbuilder-container
diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index 4b123906af..95c282b602 100644
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -41,12 +41,12 @@ spec:
spec:
containers:
- command:
- - /opt/openecomp/sdnc/bin/startODL.sh
+ - /opt/onap/sdnc/bin/startODL.sh
env:
- name: MYSQL_ROOT_PASSWORD
value: openECOMP1.0
- name: SDNC_CONFIG_DIR
- value: /opt/openecomp/sdnc/data/properties
+ value: /opt/onap/sdnc/data/properties
image: {{ .Values.image.sdnc }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: sdnc-controller-container
@@ -54,21 +54,46 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
+ - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
name: sdnc-aaiclient-properties
- - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
- name: sdnc-admportal-json
+ - mountPath: /opt/onap/sdnc/data/properties/admportal.json
+ name: sdnc-admportal-json
+ - mountPath: /var/log/onap
+ name: sdnc-logs
+ - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+ name: sdnc-log-config
ports:
- containerPort: 8181
+ - containerPort: 8101
readinessProbe:
tcpSocket:
port: 8181
initialDelaySeconds: 5
periodSeconds: 10
+ - image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: sdnc-logs
+ - mountPath: /usr/share/filebeat/data
+ name: sdnc-data-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
+ - name: filebeat-conf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: sdnc-log-config
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdnc/org.ops4j.pax.logging.cfg
+ - name: sdnc-logs
+ emptyDir: {}
+ - name: sdnc-data-filebeat
+ emptyDir: {}
- name: sdnc-aaiclient-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml
index 4f7886dc9c..45e2e26df3 100644
--- a/kubernetes/sdnc/templates/web-deployment.yaml
+++ b/kubernetes/sdnc/templates/web-deployment.yaml
@@ -45,12 +45,12 @@ spec:
- command:
- /bin/bash
- -c
- - cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh
+ - cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh
env:
- name: MYSQL_ROOT_PASSWORD
value: openECOMP1.0
- name: SDNC_CONFIG_DIR
- value: /opt/openecomp/sdnc/data/properties
+ value: /opt/onap/sdnc/data/properties
image: {{ .Values.image.admportalSdnc }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: sdnc-portal-container
@@ -60,6 +60,10 @@ spec:
- name: localtime
mountPath: /etc/localtime
readOnly: true
+ - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
+ name: sdnc-aaiclient-properties
+ - mountPath: /opt/onap/sdnc/data/properties/admportal.json
+ name: sdnc-admportal-json
readinessProbe:
tcpSocket:
port: 8843
@@ -70,5 +74,11 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
+ - name: sdnc-aaiclient-properties
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
+ - name: sdnc-admportal-json
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 0ccc357526..f7cbecab9f 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -4,6 +4,7 @@ nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
mysqlServer: mysql/mysql-server:5.6
- dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
- sdnc: nexus3.onap.org:10001/openecomp/sdnc-image:1.1-STAGING-latest
- admportalSdnc: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.1-STAGING-latest
+ dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest
+ sdnc: nexus3.onap.org:10001/onap/sdnc-image:1.2-STAGING-latest
+ admportalSdnc: nexus3.onap.org:10001/onap/admportal-sdnc-image:1.2-STAGING-latest
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file