diff options
| -rw-r--r-- | kubernetes/sdc/charts/sdc-be/templates/deployment.yaml | 38 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-be/templates/job.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-be/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml | 32 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-cs/templates/job.yaml | 27 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-cs/values.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-es/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-fe/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml | 22 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-kb/values.yaml | 6 |
12 files changed, 98 insertions, 58 deletions
diff --git a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml index 4a08504575..d0b8eae768 100644 --- a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml @@ -86,7 +86,9 @@ spec: - name: ENVNAME value: {{ .Values.global.env.name }} - name: JAVA_OPTIONS - value: "" + value: {{ .Values.config.javaOptions }} + - name: cassandra_ssl_enabled + value: {{ .Values.config.cassandraSslEnabled | quote }} - name: HOST_IP valueFrom: fieldRef: @@ -129,22 +131,22 @@ spec: - name: {{ include "common.fullname" . }}-data-filebeat mountPath: /usr/share/filebeat/data volumes: - - name: {{ include "common.fullname" . }}-localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-filebeat-conf - configMap: - name: {{ .Release.Name }}-sdc-filebeat-configmap - - name: {{ include "common.fullname" . }}-data-filebeat - emptyDir: {} - - name: {{ include "common.fullname" . }}-logback - configMap: - name : {{ include "common.fullname" . }}-logging-configmap - - name: {{ include "common.fullname" . }}-environments - configMap: - name: {{ .Release.Name }}-sdc-environments-configmap - defaultMode: 0755 - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} + - name: {{ include "common.fullname" . }}-localtime + hostPath: + path: /etc/localtime + - name: {{ include "common.fullname" . }}-filebeat-conf + configMap: + name: {{ .Release.Name }}-sdc-filebeat-configmap + - name: {{ include "common.fullname" . }}-data-filebeat + emptyDir: {} + - name: {{ include "common.fullname" . }}-logback + configMap: + name : {{ include "common.fullname" . }}-logging-configmap + - name: {{ include "common.fullname" . }}-environments + configMap: + name: {{ .Release.Name }}-sdc-environments-configmap + defaultMode: 0755 + - name: {{ include "common.fullname" . }}-logs + emptyDir: {} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-be/templates/job.yaml b/kubernetes/sdc/charts/sdc-be/templates/job.yaml index e4f3807cf8..d40ef115b3 100644 --- a/kubernetes/sdc/charts/sdc-be/templates/job.yaml +++ b/kubernetes/sdc/charts/sdc-be/templates/job.yaml @@ -55,6 +55,10 @@ spec: env: - name: ENVNAME value: {{ .Values.global.env.name }} + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP volumes: - name: {{ include "common.fullname" . }}-environments configMap: diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml index 614ead4f0c..ad63ad8e60 100644 --- a/kubernetes/sdc/charts/sdc-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-be/values.yaml @@ -35,6 +35,10 @@ pullPolicy: Always # flag to enable debugging - application support required debugEnabled: false +config: + javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m" + cassandraSslEnabled: "false" + # default number of instances replicaCount: 1 diff --git a/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml index d7e8afd30f..c96d3719ea 100644 --- a/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-cs/templates/deployment.yaml @@ -54,6 +54,12 @@ spec: env: - name: ENVNAME value: {{ .Values.global.env.name }} + - name: RELEASE + value: {{ .Values.config.release }} + - name: MAX_HEAP_SIZE + value: {{ .Values.config.maxHeapSize }} + - name: HEAP_NEWSIZE + value: {{ .Values.config.heapNewSize }} - name: HOST_IP valueFrom: fieldRef: @@ -82,21 +88,21 @@ spec: {{ toYaml .Values.affinity | indent 10 }} {{- end }} volumes: - - name: {{ include "common.fullname" . }}-localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-logs - emptyDir: {} + - name: {{ include "common.fullname" . }}-localtime + hostPath: + path: /etc/localtime + - name: {{ include "common.fullname" . }}-logs + emptyDir: {} + - name: {{ include "common.fullname" . }}-data {{- if .Values.persistence.enabled }} - - name: {{ include "common.fullname" . }}-data - persistentVolumeClaim: - claimName: {{ include "common.fullname" . }} + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }} {{- else }} - emptyDir: {} + emptyDir: {} {{- end }} - - name: {{ include "common.fullname" . }}-environments - configMap: - name: {{ .Release.Name }}-sdc-environments-configmap - defaultMode: 0755 + - name: {{ include "common.fullname" . }}-environments + configMap: + name: {{ .Release.Name }}-sdc-environments-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-cs/templates/job.yaml b/kubernetes/sdc/charts/sdc-cs/templates/job.yaml index c6e9c190e3..4d341ba8d3 100644 --- a/kubernetes/sdc/charts/sdc-cs/templates/job.yaml +++ b/kubernetes/sdc/charts/sdc-cs/templates/job.yaml @@ -52,9 +52,15 @@ spec: volumeMounts: - name: {{ include "common.fullname" . }}-environments mountPath: /root/chef-solo/environments/ + - name: {{ include "common.fullname" . }}-data + mountPath: /var/lib/cassandra/ + - name: {{ include "common.fullname" . }}-chef-cache + mountPath: /root/chef-solo/cache env: - name: ENVNAME value: {{ .Values.global.env.name }} + - name: RELEASE + value: {{ .Values.config.release }} - name: SDC_USER valueFrom: secretKeyRef: {name: {{ include "common.fullname" . }}, key: sdc_user} @@ -64,11 +70,24 @@ spec: - name: CS_PASSWORD valueFrom: secretKeyRef: {name: {{ include "common.fullname" . }}, key: cs_password} + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP volumes: - - name: {{ include "common.fullname" . }}-environments - configMap: - name: {{ .Release.Name }}-sdc-environments-configmap - defaultMode: 0755 + - name: {{ include "common.fullname" . }}-environments + configMap: + name: {{ .Release.Name }}-sdc-environments-configmap + defaultMode: 0755 + - name: {{ include "common.fullname" . }}-data + {{- if .Values.persistence.enabled }} + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }} + {{- else }} + emptyDir: {} + {{- end }} + - name: {{ include "common.fullname" . }}-chef-cache + emptyDir: {} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" restartPolicy: Never diff --git a/kubernetes/sdc/charts/sdc-cs/values.yaml b/kubernetes/sdc/charts/sdc-cs/values.yaml index 3a7752d761..27ce17d0db 100644 --- a/kubernetes/sdc/charts/sdc-cs/values.yaml +++ b/kubernetes/sdc/charts/sdc-cs/values.yaml @@ -33,8 +33,10 @@ cassandraInitImage: onap/sdc-cassandra-init:1.2-STAGING-latest pullPolicy: Always -# flag to enable debugging - application support required -debugEnabled: false +config: + release: latest + maxHeapSize: "1536M" + heapNewSize: "512M" secrets: sdc_user: YXNkY191c2Vy diff --git a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml index 75ea024f3e..699dfc310d 100644 --- a/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-es/templates/deployment.yaml @@ -74,7 +74,9 @@ spec: fieldRef: fieldPath: status.podIP - name: ES_HEAP_SIZE - value: {{ .Values.config.elasticHeapSize }} + value: {{ .Values.config.JvmHeapSize }} + - name: ES_JAVA_OPTS + value: {{ .Values.config.JvmOptions }} volumeMounts: - name: {{ include "common.fullname" . }}-environments mountPath: /root/chef-solo/environments/ diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml index 4dddbed769..db8e6b753c 100644 --- a/kubernetes/sdc/charts/sdc-es/values.yaml +++ b/kubernetes/sdc/charts/sdc-es/values.yaml @@ -40,7 +40,8 @@ debugEnabled: false # application configuration config: - elasticHeapSize: 1024M + JvmHeapSize: "1024M" + JvmOptions: "-Xms512m -Xmx512m" # default number of instances replicaCount: 1 diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml index 1a6e01bba6..2d4e21360d 100644 --- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml @@ -54,13 +54,13 @@ spec: - containerPort: {{ .Values.service.internalPort2 }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container - {{- if eq .Values.liveness.enabled true }} + {{ if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -74,7 +74,7 @@ spec: fieldRef: fieldPath: status.podIP - name: JAVA_OPTIONS - value: "" + value: {{ .Values.config.javaOptions }} volumeMounts: - name: {{ include "common.fullname" . }}-environments mountPath: /root/chef-solo/environments/ diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml index ca9af3f4b0..20c9114b73 100644 --- a/kubernetes/sdc/charts/sdc-fe/values.yaml +++ b/kubernetes/sdc/charts/sdc-fe/values.yaml @@ -31,8 +31,8 @@ repository: nexus3.onap.org:10001 image: onap/sdc-frontend:1.2-STAGING-latest pullPolicy: Always -# flag to enable debugging - application support required -debugEnabled: false +config: + javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m" # default number of instances replicaCount: 1 diff --git a/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml index 4501ded18d..de39333d30 100644 --- a/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-kb/templates/deployment.yaml @@ -51,13 +51,13 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} - {{if eq .Values.liveness.enabled true }} + {{ if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end -}} + {{ end }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -66,12 +66,12 @@ spec: env: - name: ENVNAME value: {{ .Values.global.env.name }} + - name: NODE_OPTIONS + value: {{ .Values.config.nodeOptions }} - name: HOST_IP valueFrom: fieldRef: fieldPath: status.podIP - - name: ELASTICSEARCH_URL - value: "http://{{ .Release.Name }}-{{ index .Values "sdc-es" "service" "name" }}:9200" volumeMounts: - name: {{ include "common.fullname" . }}-environments mountPath: /root/chef-solo/environments/ @@ -89,12 +89,12 @@ spec: {{ toYaml .Values.affinity | indent 10 }} {{- end }} volumes: - - name: {{ include "common.fullname" . }}-localtime - hostPath: - path: /etc/localtime - - name: {{ include "common.fullname" . }}-environments - configMap: - name: {{ .Release.Name }}-sdc-environments-configmap - defaultMode: 0755 + - name: {{ include "common.fullname" . }}-localtime + hostPath: + path: /etc/localtime + - name: {{ include "common.fullname" . }}-environments + configMap: + name: {{ .Release.Name }}-sdc-environments-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-kb/values.yaml b/kubernetes/sdc/charts/sdc-kb/values.yaml index 3523374f12..02a7b9403d 100644 --- a/kubernetes/sdc/charts/sdc-kb/values.yaml +++ b/kubernetes/sdc/charts/sdc-kb/values.yaml @@ -31,8 +31,8 @@ repository: nexus3.onap.org:10001 image: onap/sdc-kibana:1.2-STAGING-latest pullPolicy: Always -# flag to enable debugging - application support required -debugEnabled: false +config: + nodeOptions: "--max-old-space-size=200" # default number of instances replicaCount: 1 @@ -47,7 +47,7 @@ liveness: periodSeconds: 10 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container - enabled: true + enabled: false readiness: initialDelaySeconds: 10 |