[OOM] Fixing k8s ServiceAccounts

[oom.git] / kubernetes / nbi / values.yaml

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index dc32367..3591d94 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -20,35 +20,14 @@ global:
   nodePortPrefix: 302
   mariadbGalera: &mariadbGalera
     #This flag allows SO to instantiate its own mariadb-galera cluster
+    #When changing it to "true", also set "globalCluster: false"
+    #as the dependency check will not work otherwise (Chart.yaml)
     localCluster: false
+    globalCluster: true
     service: mariadb-galera
     internalPort: 3306
     nameOverride: mariadb-galera
-  aafEnabled: true
-  msbEnabled: true
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: nbi-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: nbi
-  fqi: nbi@nbi.onap.org
-  public_fqdn: nbi.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: >
-    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
-    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
-
-aafConfig:
-  permission_user: 1000
-  permission_group: 999
+  msbEnabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -109,6 +88,8 @@ mariadb-init:
     userCredentialsExternalSecret: *dbUserSecretName
     mysqlDatabase: *mysqlDbName
   nameOverride: nbi-config
+  serviceAccount:
+    nameOverride: nbi-config
 
 mongo:
   nameOverride: nbi-mongo
@@ -150,12 +131,10 @@ service:
   type: NodePort
   portName: api
   name: nbi
-  internalPort: 8443
-  internalPlainPort: 8080
+  internalPort: 8080
   ports:
     - name: http
-      port: 8443
-      plain_port: 8080
+      port: 8080
       nodePort: '74'
 
 ingress:
@@ -163,8 +142,7 @@ ingress:
   service:
     - baseaddr: "nbi-api"
       name: "nbi"
-      port: 8443
-      plain_port: 8080
+      port: 8080
   config:
     ssl: "redirect"
 # Resource Limit flavor -By Default using small
@@ -173,17 +151,17 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 2Gi
+      cpu: 999
+      memory: 1Gi
     requests:
-      cpu: 100m
+      cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: 999
+      memory: 2Gi
     requests:
-      cpu: 200m
+      cpu: 1
       memory: 2Gi
   unlimited: {}