summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/dmaap-listener/values.yaml3
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml1
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/sdnc-portal/values.yaml1
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/Chart.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/requirements.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/values.yaml1
-rw-r--r--kubernetes/sdnc/requirements.yaml8
-rwxr-xr-xkubernetes/sdnc/resources/config/conf/aaiclient.properties4
-rw-r--r--kubernetes/sdnc/sdnc-prom/Chart.yaml2
-rw-r--r--kubernetes/sdnc/sdnc-prom/requirements.yaml2
-rw-r--r--kubernetes/sdnc/sdnc-prom/templates/deployment.yaml2
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml2
-rw-r--r--kubernetes/sdnc/values.yaml1
24 files changed, 29 insertions, 24 deletions
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index fe27426f13..6d12ea7f73 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN Controller
name: sdnc
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
index ba2e574d06..866a8d4280 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDNC DMaaP Listener
name: dmaap-listener
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
index d69d67dfc4..7a5b1f217c 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
name: properties
subPath: aai.properties
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
index 2520fb1fc0..a0ac529426 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
@@ -90,4 +90,5 @@ resources:
memory: 4Gi
requests:
cpu: 1
- memory: 2Gi \ No newline at end of file
+ memory: 2Gi
+ unlimited: {} \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
index 82b9fc5f89..013131d44d 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN-C Ansible Server
name: sdnc-ansible-server
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
index fe9d302e17..55c381102f 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
name: config
subPath: RestServer_config
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
index 04eca00052..d8e828742d 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
@@ -89,3 +89,4 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
index 193c38ffce..1484ec5191 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDN-C Admin Portal
name: sdnc-portal
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
index 1e8f788318..896eaf4baa 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local' \ 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 aba6870908..35dffee552 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: properties
subPath: svclogic.properties.sdnctldb02
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index 1fba2a16ea..1d56d84c15 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -96,3 +96,4 @@ resources:
requests:
cpu: 1
memory: 1Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
index 35b2a2e9c3..ee5c7f91e2 100644
--- a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: SDNC UEB Listener
name: ueb-listener
-version: 2.0.0 \ No newline at end of file
+version: 3.0.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
index ce82a2f838..9f23fac6f8 100644
--- a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
index 2258d4ab94..1c5f9179c0 100644
--- a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
name: properties
subPath: ueb-listener.properties
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index c1dafbcd76..35602161d8 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -92,3 +92,4 @@ resources:
requests:
cpu: 1
memory: 2Gi
+ unlimited: {}
diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml
index 0ecd9b5e7b..8c16310ce0 100644
--- a/kubernetes/sdnc/requirements.yaml
+++ b/kubernetes/sdnc/requirements.yaml
@@ -14,21 +14,21 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: controller-blueprints
version: ~3.0.0
repository: '@local'
- name: mysql
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: network-name-gen
version: ~3.0.0
repository: '@local'
- name: dgbuilder
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
- name: sdnc-prom
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
condition: config.geoEnabled
diff --git a/kubernetes/sdnc/resources/config/conf/aaiclient.properties b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
index c925bfd07f..035942b304 100755
--- a/kubernetes/sdnc/resources/config/conf/aaiclient.properties
+++ b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
@@ -30,8 +30,8 @@ org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreO
org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit
org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
-org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC
-org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC
+org.onap.ccsdk.sli.adaptors.aai.client.name=sdnc@sdnc.onap.org
+org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456!
org.onap.ccsdk.sli.adaptors.aai.application=openECOMP
#
diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/sdnc-prom/Chart.yaml
index 3c678e2b92..d4e5daa03b 100644
--- a/kubernetes/sdnc/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/sdnc-prom/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP SDNC Policy Driven Ownership Management
name: sdnc-prom
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/sdnc-prom/requirements.yaml
index 37545fe2e0..cf4086962c 100644
--- a/kubernetes/sdnc/sdnc-prom/requirements.yaml
+++ b/kubernetes/sdnc/sdnc-prom/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~2.0.0
+ version: ~3.0.0
repository: '@local'
diff --git a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
index 76f722c65f..d457bd8f98 100644
--- a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
mountPath: /app/config/coredns
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 784bc6982f..32d98840f7 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -134,7 +134,7 @@ spec:
- mountPath: /var/log/onap
name: logs
resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 800cd0d1b8..8560166ef6 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -216,3 +216,4 @@ resources:
requests:
cpu: 2
memory: 4Gi
+ unlimited: {}