Merge "[AAI] Make AAI Sparky BE ServiceMesh ready"

diff --combined kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index a724129,bb0b9bb..31ea946
--- 1/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
--- 2/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@@ -28,13 -28,6 +28,13 @@@ metadata
      heritage: {{ .Release.Service }}
  spec:
    replicas: {{ .Values.replicaCount }}
 +  strategy:
 +    type: {{ .Values.updateStrategy.type }}
 +    {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
 +    rollingUpdate:
 +      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
 +      maxSurge: {{ .Values.updateStrategy.maxSurge }}
 +    {{- end }}
    selector:
      matchLabels:
        app: {{ include "common.name" . }}
@@@ -147,18 -140,19 +147,19 @@@
            subPath: logback.xml
          ports:
          - containerPort: {{ .Values.service.internalPort }}
+         - containerPort: {{ .Values.service.internalPlainPort }}
          # disable liveness probe when breakpoints set in debugger
          # so K8s doesn't restart unresponsive container
          {{- if eq .Values.liveness.enabled true }}
          livenessProbe:
            tcpSocket:
-             port: {{ .Values.service.internalPort }}
+             port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
            periodSeconds: {{ .Values.liveness.periodSeconds }}
          {{ end -}}
          readinessProbe:
            tcpSocket:
-             port: {{ .Values.service.internalPort }}
+             port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
            periodSeconds: {{ .Values.readiness.periodSeconds }}
          resources:

diff --combined kubernetes/aai/components/aai-sparky-be/values.yaml
index ee3c5c4,a8896e0..29953b4
--- 1/kubernetes/aai/components/aai-sparky-be/values.yaml
--- 2/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@@ -95,11 -95,6 +95,11 @@@ nsSuffix: aa
  # default number of instances
  replicaCount: 1
  
 +updateStrategy:
 +  type: RollingUpdate
 +  maxUnavailable: 0
 +  maxSurge: 1
 +
  nodeSelector: {}
  
  affinity: {}
@@@ -119,7 -114,9 +119,9 @@@ readiness
  service:
    type: NodePort
    portName: http
+   externalPort: 8000
    internalPort: 8000
+   internalPlainPort: 9517
    nodePort: 20
  
  ingress: