summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aai/charts/aai-babel/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-babel/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-champ/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-champ/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-data-router/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-data-router/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-elasticsearch/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-gizmo/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-graphadmin/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-modelloader/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-resources/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-resources/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-search-data/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-search-data/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-spike/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-spike/values.yaml18
-rw-r--r--kubernetes/aai/charts/aai-traversal/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/charts/aai-traversal/values.yaml18
-rw-r--r--kubernetes/common/controller-blueprints/resources/config/application.properties10
-rw-r--r--kubernetes/common/controller-blueprints/resources/config/logback.xml3
-rw-r--r--kubernetes/common/controller-blueprints/templates/deployment.yaml10
-rw-r--r--kubernetes/common/controller-blueprints/templates/secrets.yaml2
-rw-r--r--kubernetes/common/controller-blueprints/values.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml19
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml20
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml19
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml19
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml20
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml19
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml19
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml19
-rw-r--r--kubernetes/oof/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/values.yaml19
-rw-r--r--kubernetes/sdnc/resources/config/conf/blueprints-processor-adaptor.properties35
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml6
49 files changed, 444 insertions, 55 deletions
diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
index 7778324200..2f8f60f708 100644
--- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: logback.xml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-babel/values.yaml b/kubernetes/aai/charts/aai-babel/values.yaml
index 7ba1c6bc03..01b4dfc759 100644
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@ -27,6 +27,8 @@ global:
# application image
image: onap/babel:1.3-STAGING-latest
+flavor: small
+
# application configuration
config:
keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
@@ -61,4 +63,18 @@ service:
ingress:
enabled: false
-resources: {}
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index d2f7bca593..4987e4a05d 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -86,7 +86,7 @@ spec:
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-champ/values.yaml b/kubernetes/aai/charts/aai-champ/values.yaml
index a6435dd795..75ecffb473 100644
--- a/kubernetes/aai/charts/aai-champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@ -27,6 +27,8 @@ global:
# application image
image: onap/champ:1.3-STAGING-latest
+flavor: small
+
# application configuration
config:
keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
@@ -60,7 +62,21 @@ service:
ingress:
enabled: false
-resources: {}
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
# XML beans configuration
event:
diff --git a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
index 4b58c7360d..585cc4ff3d 100644
--- a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml
@@ -110,6 +110,8 @@ spec:
port: {{ .Values.service.internalPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
+ resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
volumes:
- name: localtime
hostPath:
diff --git a/kubernetes/aai/charts/aai-data-router/values.yaml b/kubernetes/aai/charts/aai-data-router/values.yaml
index 10521abaf9..06c64c30d7 100644
--- a/kubernetes/aai/charts/aai-data-router/values.yaml
+++ b/kubernetes/aai/charts/aai-data-router/values.yaml
@@ -24,7 +24,7 @@ repository: nexus3.onap.org:10001
image: onap/data-router:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
dockerhubRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
@@ -82,7 +82,6 @@ persistence:
mountPath: /dockerdata-nfs
mountSubPath: aai/data-router/logs
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -100,3 +99,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
index acb059985d..e1f3b39542 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/templates/deployment.yaml
@@ -87,7 +87,7 @@ spec:
- name: elasticsearch-data
mountPath: /usr/share/elasticsearch/data
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-elasticsearch/values.yaml b/kubernetes/aai/charts/aai-elasticsearch/values.yaml
index 0cb1a369bb..c6afbb5ee4 100644
--- a/kubernetes/aai/charts/aai-elasticsearch/values.yaml
+++ b/kubernetes/aai/charts/aai-elasticsearch/values.yaml
@@ -23,6 +23,8 @@ dockerhubRepository: docker.io
image: elasticsearch:2.4.1
pullPolicy: Always
+flavor: small
+
# application configuration
config:
tcpPort: 8443
@@ -78,7 +80,6 @@ persistence:
mountPath: /dockerdata-nfs
mountSubPath: aai/elasticsearch/data
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -96,3 +97,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
index 0fb8552c37..d36ae2f874 100644
--- a/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
@@ -89,7 +89,7 @@ spec:
name: {{ include "common.fullname" . }}-logback-config
subPath: logback.xml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-gizmo/values.yaml b/kubernetes/aai/charts/aai-gizmo/values.yaml
index 50c9d77a4d..d34ff2b612 100644
--- a/kubernetes/aai/charts/aai-gizmo/values.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/values.yaml
@@ -24,7 +24,7 @@ global:
# application image
image: onap/gizmo:1.3-STAGING-latest
-
+flavor: small
# application configuration
config:
keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
@@ -59,4 +59,18 @@ service:
ingress:
enabled: false
-resources: {}
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
index 9b0ec6383e..69aeb326e2 100644
--- a/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-graphadmin/values.yaml b/kubernetes/aai/charts/aai-graphadmin/values.yaml
index 6b7997f944..3b7bd60ba7 100644
--- a/kubernetes/aai/charts/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/charts/aai-graphadmin/values.yaml
@@ -31,7 +31,7 @@ repository: nexus3.onap.org:10001
image: onap/aai-graphadmin:1.0-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
# default number of instances
replicaCount: 1
@@ -107,7 +107,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -125,3 +124,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index fe989b9d29..cee081859b 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
@@ -59,6 +59,8 @@ spec:
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
+ resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
# side car containers
- name: filebeat-onap
diff --git a/kubernetes/aai/charts/aai-modelloader/values.yaml b/kubernetes/aai/charts/aai-modelloader/values.yaml
index 977860fd30..e406443a6d 100644
--- a/kubernetes/aai/charts/aai-modelloader/values.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/values.yaml
@@ -24,7 +24,7 @@ repository: nexus3.onap.org:10001
image: onap/model-loader:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
# application configuration
config: {}
@@ -61,7 +61,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -79,3 +78,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 7df214f321..065e1307dd 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -520,7 +520,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-resources/values.yaml b/kubernetes/aai/charts/aai-resources/values.yaml
index 943ace8965..e9a0063f6a 100644
--- a/kubernetes/aai/charts/aai-resources/values.yaml
+++ b/kubernetes/aai/charts/aai-resources/values.yaml
@@ -25,7 +25,7 @@ repository: nexus3.onap.org:10001
image: onap/aai-resources:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
# default number of instances
replicaCount: 1
@@ -79,7 +79,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -97,3 +96,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
index dffc9cf705..e486143e96 100644
--- a/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-search-data/templates/deployment.yaml
@@ -93,7 +93,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-search-data/values.yaml b/kubernetes/aai/charts/aai-search-data/values.yaml
index 08bdbdb064..bfde398e91 100644
--- a/kubernetes/aai/charts/aai-search-data/values.yaml
+++ b/kubernetes/aai/charts/aai-search-data/values.yaml
@@ -26,7 +26,7 @@ repository: nexus3.onap.org:10001
image: onap/search-data-service:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
# application configuration
config:
elasticsearchHttpPort: 9200
@@ -61,7 +61,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -79,3 +78,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 1
+ memory: 2Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
index 48235bcd02..a6414ddb76 100644
--- a/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
@@ -117,7 +117,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index 50c624da9a..47b5a1d79a 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -31,7 +31,7 @@ repository: nexus3.onap.org:10001
image: onap/sparky-be:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
dockerhubRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# application configuration
@@ -82,7 +82,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -100,3 +99,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
index edf6ce84fe..a6801e1b14 100644
--- a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml
@@ -103,7 +103,7 @@ spec:
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/aai/charts/aai-spike/values.yaml b/kubernetes/aai/charts/aai-spike/values.yaml
index 6429d3f119..4fc3a0bdd4 100644
--- a/kubernetes/aai/charts/aai-spike/values.yaml
+++ b/kubernetes/aai/charts/aai-spike/values.yaml
@@ -25,7 +25,7 @@ global:
# application image
image: onap/spike:1.0-STAGING-latest
-
+flavor: small
# application configuration
config:
keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
@@ -60,7 +60,21 @@ service:
ingress:
enabled: false
-resources: {}
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
# XML bean configuration
event:
diff --git a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index 3cedaecc9b..fb07427fd1 100644
--- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@ -352,7 +352,7 @@ spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
resources:
-{{ toYaml .Values.resources | indent 10 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-traversal/values.yaml b/kubernetes/aai/charts/aai-traversal/values.yaml
index a3410adacc..83bd1a9fad 100644
--- a/kubernetes/aai/charts/aai-traversal/values.yaml
+++ b/kubernetes/aai/charts/aai-traversal/values.yaml
@@ -26,7 +26,7 @@ repository: nexus3.onap.org:10001
image: onap/aai-traversal:1.3-STAGING-latest
pullPolicy: Always
restartPolicy: Always
-
+flavor: small
# application configuration
config:
@@ -75,7 +75,6 @@ service:
ingress:
enabled: false
-resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -93,3 +92,18 @@ resources: {}
# requests:
# cpu: 2
# memory: 4Gi
+resources:
+ small:
+ limits:
+ cpu: 2
+ memory: 4Gi
+ requests:
+ cpu: 2
+ memory: 4Gi
+ large:
+ limits:
+ cpu: 4
+ memory: 8Gi
+ requests:
+ cpu: 4
+ memory: 8Gi
diff --git a/kubernetes/common/controller-blueprints/resources/config/application.properties b/kubernetes/common/controller-blueprints/resources/config/application.properties
index ec3a1ffce7..48678fcef8 100644
--- a/kubernetes/common/controller-blueprints/resources/config/application.properties
+++ b/kubernetes/common/controller-blueprints/resources/config/application.properties
@@ -18,7 +18,9 @@ appName=ControllerBluePrints
ms_name=org.onap.ccsdk.apps.controllerblueprints
appVersion=1.0.0
-#logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr($ threadId: {PID:- }){magenta} %clr(---){faint} %clr([ hostname: %X{hostname} serviceName: %X{serviceName} version: %X{version} transactionId: %X{transactionId} requestTimeStamp: %X{requestTimestamp} responseTimeStamp: %X{responseTimestamp} duration: %X{duration}]){yellow} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex
+# Basic Authentication
+basic-auth.user-name=ccsdkapps
+basic-auth.hashed-pwd=$2a$10$MJxhNiOAffxbyrV9.rrOUewP9Q/ASg5Nit2cmP.yBaXGsVXo8BW3y
logging.level.org.springframework.web=INFO
logging.level.org.hibernate.SQL=warn
@@ -28,9 +30,9 @@ logging.level.org.hibernate.type.descriptor.sql=debug
spring.jackson.default-property-inclusion=non_null
#Swagger Configuration
-swagger.contact.name=Brinda Santh Muthuramalingam
-swagger.contact.url=www.onap.com
-swagger.contact.email=brindasanth@onap.com
+swagger.contact.name=CCSDK team
+swagger.contact.url=www.onap.org
+swagger.contact.email=onap-discuss@lists.onap.org
spring.jpa.properties.hibernate.show_sql=true
spring.jpa.properties.hibernate.use_sql_comments=true
diff --git a/kubernetes/common/controller-blueprints/resources/config/logback.xml b/kubernetes/common/controller-blueprints/resources/config/logback.xml
index 9129fcf150..b73db7145f 100644
--- a/kubernetes/common/controller-blueprints/resources/config/logback.xml
+++ b/kubernetes/common/controller-blueprints/resources/config/logback.xml
@@ -33,6 +33,7 @@
<logger name="org.springframework" level="info"/>
<logger name="org.springframework.web" level="info"/>
+ <logger name="org.springframework.security.web.authentication" level="warn"/>
<logger name="org.hibernate" level="error"/>
<logger name="org.onap.ccsdk.apps" level="info"/>
@@ -40,4 +41,4 @@
<appender-ref ref="STDOUT"/>
</root>
-</configuration> \ No newline at end of file
+</configuration>
diff --git a/kubernetes/common/controller-blueprints/templates/deployment.yaml b/kubernetes/common/controller-blueprints/templates/deployment.yaml
index fc7329cf9f..18fb16561a 100644
--- a/kubernetes/common/controller-blueprints/templates/deployment.yaml
+++ b/kubernetes/common/controller-blueprints/templates/deployment.yaml
@@ -81,6 +81,16 @@ spec:
secretKeyRef:
name: {{ template "common.fullname" . }}
key: db-root-password
+ - name: MS_USER
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: restUser
+ - name: MS_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: {{ template "common.fullname" . }}
+ key: restPassword
- name: INIT_DATA_LOAD
value: {{ .Values.config.initDataLoad | quote }}
- name: STICKYSELECTORKEY
diff --git a/kubernetes/common/controller-blueprints/templates/secrets.yaml b/kubernetes/common/controller-blueprints/templates/secrets.yaml
index 4b11188429..b4ab161809 100644
--- a/kubernetes/common/controller-blueprints/templates/secrets.yaml
+++ b/kubernetes/common/controller-blueprints/templates/secrets.yaml
@@ -25,3 +25,5 @@ metadata:
type: Opaque
data:
db-root-password: {{ index .Values "mariadb-galera" "config" "mariadbRootPassword" | b64enc | quote }}
+ restUser: {{ .Values.config.restUser | b64enc | quote }}
+ restPassword: {{ .Values.config.restPassword | b64enc | quote }}
diff --git a/kubernetes/common/controller-blueprints/values.yaml b/kubernetes/common/controller-blueprints/values.yaml
index a08ab121ee..f8b8aba9f4 100644
--- a/kubernetes/common/controller-blueprints/values.yaml
+++ b/kubernetes/common/controller-blueprints/values.yaml
@@ -53,6 +53,8 @@ config:
initDataLoad: true
stickySelectorKey:
envContext: DEV
+ restUser: ccsdkapps
+ restPassword: ccsdkapps
mariadb-galera:
config:
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
index 95b6783e72..690bb74973 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: log.conf
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
index 6114de329e..ea83587cc4 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/values.yaml
@@ -24,6 +24,24 @@ ingress:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -34,4 +52,3 @@ liveness:
readiness:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
index 2d52b091dd..f16b09f956 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/templates/deployment.yaml
@@ -78,7 +78,7 @@ spec:
- name: {{ include "common.fullname" . }}-data
mountPath: /var/lib/cassandra/data
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
index 400387ccce..1268badaf4 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-cassandra/values.yaml
@@ -38,6 +38,24 @@ nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 16Gi
+ cpu: 8000m
+ requests:
+ memory: 8Gi
+ cpu: 4000m
+ large:
+ limits:
+ memory: 32Gi
+ cpu: 16000m
+ requests:
+ memory: 16Gi
+ cpu: 8000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -89,5 +107,3 @@ service:
ingress:
enabled: false
-
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
index 3274040470..3a321297c3 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
index 57c56d5e44..659128d851 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-controller/values.yaml
@@ -17,6 +17,24 @@ ingress:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -27,4 +45,3 @@ liveness:
readiness:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
index 4314227dcc..d5f619ebdc 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/templates/deployment.yaml
@@ -97,7 +97,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: AAF_RootCA.cer
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
index 57c56d5e44..659128d851 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-data/values.yaml
@@ -17,6 +17,24 @@ ingress:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -27,4 +45,3 @@ liveness:
readiness:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
index 902914e3b6..78833406b1 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/templates/deployment.yaml
@@ -46,6 +46,8 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}" #"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ resources:
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
index 1fcd5f6066..dda1c0f1cc 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
@@ -48,6 +48,24 @@ nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -69,5 +87,3 @@ service:
portName: oof-has-music
ingress:
enabled: false
-
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
index b5ef0c8a30..d90943c72b 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
index 57c56d5e44..659128d851 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-reservation/values.yaml
@@ -17,6 +17,24 @@ ingress:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -27,4 +45,3 @@ liveness:
readiness:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
index abd2f0a7aa..ad1e1c57b5 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/templates/deployment.yaml
@@ -88,7 +88,7 @@ spec:
name: {{ .Values.global.commonConfigPrefix }}-config
subPath: healthy.sh
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
index 57c56d5e44..659128d851 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-solver/values.yaml
@@ -17,6 +17,24 @@ ingress:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -27,4 +45,3 @@ liveness:
readiness:
initialDelaySeconds: 10
periodSeconds: 10
-resources: {}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
index 70df814abe..43f068066b 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/templates/deployment.yaml
@@ -54,7 +54,7 @@ spec:
name: localtime
readOnly: true
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
index b0eca78738..e61eda0de0 100644
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-zookeeper/values.yaml
@@ -30,6 +30,24 @@ pullPolicy: Always
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -48,4 +66,3 @@ service:
portName: oof-has-zookeeper
ingress:
enabled: false
-resources: {}
diff --git a/kubernetes/oof/templates/deployment.yaml b/kubernetes/oof/templates/deployment.yaml
index da7cb70009..3341505847 100644
--- a/kubernetes/oof/templates/deployment.yaml
+++ b/kubernetes/oof/templates/deployment.yaml
@@ -77,7 +77,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: osdf_config.yaml
resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index ac1bcc0cb1..5aa462f491 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -75,6 +75,24 @@ config:
replicaCount: 1
nodeSelector: {}
affinity: {}
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+ small:
+ limits:
+ memory: 4Gi
+ cpu: 2000m
+ requests:
+ memory: 1Gi
+ cpu: 500m
+ large:
+ limits:
+ memory: 8Gi
+ cpu: 4000m
+ requests:
+ memory: 2Gi
+ cpu: 1000m
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@ -93,4 +111,3 @@ service:
nodePort: 48
ingress:
enabled: false
-resources: {}
diff --git a/kubernetes/sdnc/resources/config/conf/blueprints-processor-adaptor.properties b/kubernetes/sdnc/resources/config/conf/blueprints-processor-adaptor.properties
new file mode 100644
index 0000000000..eb17d09882
--- /dev/null
+++ b/kubernetes/sdnc/resources/config/conf/blueprints-processor-adaptor.properties
@@ -0,0 +1,35 @@
+###
+# Copyright � 2017-2018 AT&T Intellectual Property.
+# Modifications Copyright � 2018 IBM.
+#
+# 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.
+###
+#
+# Configuration file for SDNC Controller Module
+#
+
+org.onap.ccsdk.features.rest.adaptors.envtype=solo
+
+# Config Generator Microservices
+org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://controller-blueprints:8080/api/v1/
+org.onap.ccsdk.features.rest.adaptors.modelservice.user=ccsdkapps
+org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=ccsdkapps
+
+# Generic RESTCONF Adaptor
+org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
+org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
+org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
+org.onap.ccsdk.features.rest.adaptors.restconf.passwd={{ .Values.config.odlPassword}}
+org.onap.ccsdk.features.rest.adaptors.restconf.url=http://sdnc:8282/restconf/
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 8c52e5c20e..784bc6982f 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -123,6 +123,12 @@ spec:
- mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
name: properties
subPath: svclogic.properties
+ - mountPath: {{ .Values.config.configDir }}/netbox.properties
+ name: properties
+ subPath: netbox.properties
+ - mountPath: {{ .Values.config.configDir }}/blueprints-processor-adaptor.properties
+ name: properties
+ subPath: blueprints-processor-adaptor.properties
- mountPath: {{ .Values.persistence.mdsalPath }}
name: {{ include "common.fullname" . }}-mdsal
- mountPath: /var/log/onap