From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Tue, 18 Jul 2023 19:43:38 +0000 (+0000)
Subject: Merge "[AAI] Fix Istio compatibility and add Job ServiceAccount"
X-Git-Tag: 13.0.0-DOC~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=491446e0ef8966809476e969544ef6187e39bd58;hp=-c;p=oom.git

Merge "[AAI] Fix Istio compatibility and add Job ServiceAccount"
---

491446e0ef8966809476e969544ef6187e39bd58
diff --combined kubernetes/aai/components/aai-graphadmin/values.yaml
index 199ce52a29,539beb420e..51051746fb
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@@ -195,7 -195,7 +195,7 @@@ service
    internalPort: 8449
    portName2: tcp-5005
    internalPort2: 5005
-   portName3: http-aai-graphadmin
+   portName3: http-graphadmin
    internalPort3: 8448
    terminationGracePeriodSeconds: 120
  
@@@ -244,18 -244,18 +244,18 @@@ accessLogback
  resources:
    small:
      limits:
 -      cpu: 2
 +      cpu: 999
        memory: 4Gi
      requests:
        cpu: 0.5
 -      memory: 1536Mi
 +      memory: 1.6Gi
    large:
      limits:
 -      cpu: 4
 +      cpu: 999
        memory: 8Gi
      requests:
        cpu: 1
 -      memory: 2Gi
 +      memory: 3.2Gi
    unlimited: {}
  
  metrics:
diff --combined kubernetes/aai/components/aai-resources/values.yaml
index 93cbb0a8e5,1770b5beb8..6efb129da1
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@@ -197,7 -197,7 +197,7 @@@ service
    internalPort: 8447
    portName2: tcp-5005
    internalPort2: 5005
-   portName3: http-aai-resources
+   portName3: http-resources
    internalPort3: 8448
    terminationGracePeriodSeconds: 120
    sessionAffinity: None
@@@ -231,18 -231,18 +231,18 @@@ serviceMesh
  resources:
    small:
      limits:
 -      cpu: 2
 +      cpu: 999
        memory: 4Gi
      requests:
        cpu: 1
        memory: 3Gi
    large:
      limits:
 -      cpu: 4
 +      cpu: 999
        memory: 8Gi
      requests:
        cpu: 2
 -      memory: 4Gi
 +      memory: 6Gi
    unlimited: {}
  
  metrics:
diff --combined kubernetes/aai/components/aai-traversal/values.yaml
index ca41b76fec,349fe77496..a759f98552
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@@ -220,7 -220,7 +220,7 @@@ service
    internalPort: 8446
    portName2: tcp-5005
    internalPort2: 5005
-   portName3: http-aai-traversal
+   portName3: http-traversal
    internalPort3: 8448
    terminationGracePeriodSeconds: 120
    sessionAffinity: None
@@@ -251,14 -251,14 +251,14 @@@ accessLogback
  resources:
    small:
      limits:
 -      cpu: 2
 +      cpu: 999
        memory: 4Gi
      requests:
        cpu: 1
        memory: 3Gi
    large:
      limits:
 -      cpu: 4
 +      cpu: 999
        memory: 8Gi
      requests:
        cpu: 2
diff --combined kubernetes/aai/values.yaml
index 1acae55c11,25b804820e..fbd3438c1c
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@@ -375,7 -375,7 +375,7 @@@ service
  
  metricsService:
    type: ClusterIP
-   portName: http-prometheus
+   portName: http-pro
    externalPort: 8448
    internalPort: 8448
  
@@@ -437,18 -437,18 +437,18 @@@ serviceMesh
  resources:
    small:
      limits:
 -      cpu: 2
 +      cpu: 999
        memory: 4Gi
      requests:
        cpu: 1
 -      memory: 1Gi
 +      memory: 1.2Gi
    large:
      limits:
 -      cpu: 4
 +      cpu: 999
        memory: 8Gi
      requests:
        cpu: 2
 -      memory: 2Gi
 +      memory: 2.4Gi
    unlimited: {}
  
  #Pods Service Account