diff options
Diffstat (limited to 'kubernetes')
5 files changed, 19 insertions, 11 deletions
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl index 101dc075f9..eefee769bd 100644 --- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl +++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/templates/_deployment.tpl @@ -254,6 +254,7 @@ post-processing. {{- $drNeedProvisioning := or .Values.drFeedConfig .Values.drSubConfig -}} {{- $dcaeName := print (include "common.fullname" .) }} {{- $dcaeLabel := (dict "dcaeMicroserviceName" $dcaeName) -}} +{{- $podLabels := default .Values.podLabels .labels -}} {{- $dot := . -}} apiVersion: apps/v1 kind: Deployment @@ -262,7 +263,11 @@ spec: replicas: 1 selector: {{- include "common.selectors" . | nindent 4 }} template: + {{- if $podLabels}} + metadata: {{- include "common.templateMetadata" (dict "dot" . "labels" $podLabels) | nindent 6 }} + {{- else }} metadata: {{- include "common.templateMetadata" . | nindent 6 }} + {{- end }} spec: securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml index a1a2467a71..e77d31859b 100644 --- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml @@ -96,9 +96,13 @@ readiness: # since there are problems receiving binary data via the sidecar # the service port is excluded in the sidecar processing podAnnotations: + traffic.sidecar.istio.io/excludeOutboundPorts: '6061' traffic.sidecar.istio.io/excludeInboundPorts: '6061' traffic.sidecar.istio.io/includeInboundPorts: '*' +podLabels: + sidecar.istio.io/inject: "false" + # service configuration service: type: NodePort diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 5d2503089c..5a89df5732 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -290,7 +290,7 @@ spec: - name: JAVA_HOME value: "{{ .Values.config.javaHome}}" - name: JAVA_OPTS - value: "-Xms{{.Values.config.odl.javaOptions.minMemory}} -Xmx{{.Values.config.odl.javaOptions.maxMemory}}" + value: "-XX:MaxRAMPercentage={{.Values.config.odl.javaOptions.maxRAMPercentage}}" - name: LOG4J_FORMAT_MSG_NO_LOOKUPS value: "true" - name: KARAF_CONSOLE_LOG_LEVEL diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 69c81f8087..c19a67fb8a 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -316,8 +316,7 @@ config: maxGCPauseMillis: 100 parallelGCThreads : 3 numberGCLogFiles: 10 - minMemory: 1028m - maxMemory: 6144m + maxRAMPercentage: 70 gcLogOptions: "" # Next line enables gc logging # gcLogOptions: "-Xlog:gc=trace:file={{.Values.config.odl.gcLogDir}}/gc-%t.log}:time,level,tags:filecount={{.Values.config.odl.javaOptions.numberGCLogFiles}}" @@ -668,17 +667,17 @@ resources: small: limits: cpu: "2" - memory: "4.7Gi" + memory: "7Gi" requests: cpu: "1" - memory: "4.7Gi" + memory: "7Gi" large: limits: cpu: "4" - memory: "9.4Gi" + memory: "10Gi" requests: cpu: "2" - memory: "9.4Gi" + memory: "10Gi" unlimited: {} #Pods Service Account diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml index 0da387faaa..60a71f4de0 100755 --- a/kubernetes/so/components/soHelpers/values.yaml +++ b/kubernetes/so/components/soHelpers/values.yaml @@ -27,14 +27,14 @@ global: startupProbe: path: /manage/health scheme: HTTP - periodSeconds: 3 - timeoutSeconds: 3 + periodSeconds: 5 + timeoutSeconds: 5 successThreshold: 1 - failureThreshold: 200 + failureThreshold: 120 livenessProbe: path: /manage/health scheme: HTTP - periodSeconds: 20 + periodSeconds: 60 timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 |