X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-admin-cockpit%2Fvalues.yaml;h=2da7dd0baaff36242edba43586df8b67378ce494;hb=2c1ba293ccef7dcaf09c46f5b0a8a36245238389;hp=6cba922571ccb89b7d38e2ab1649a6ea13a5f76b;hpb=758be4f3fe0f022b9e558179257cd66cb3ddeb46;p=oom.git

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 6cba922571..2da7dd0baa 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -27,19 +27,13 @@ global:
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
   readinessImage: onap/oom/readiness:3.0.1
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
   envsubstImage: dibi/envsubst
-  aafEnabled: true
   persistence:
     mountPath: /dockerdata-nfs
-  security:
-    aaf:
-      enabled: true
-  aaf:
-    auth:
-      header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo=
   mariadbGalera:
-    serviceName: mariadb-galera
+    # flag to enable the DB creation via mariadb-operator
+    useOperator: true
+    service: mariadb-galera
     servicePort: '3306'
 
 #################################################################
@@ -72,9 +66,18 @@ secrets:
 # Application configuration defaults.
 #################################################################
 repository: nexus3.onap.org:10001
-image: onap/so/so-admin-cockpit:1.8.2
+image: onap/so/so-admin-cockpit:1.9.0
 pullPolicy: Always
 
+# Local mariadb galera instance default name
+mariadb-galera:
+  nameOverride: so-mariadb-galera
+  service:
+    internalPort: 3306
+  mariadbOperator:
+    galera:
+      enabled: false
+
 db:
   userName: so_user
   userPassword: so_User123
@@ -93,12 +96,6 @@ app: so-admin-cockpit
 # soHelpers part
 #################################################################
 soHelpers:
-  nameOverride: so-cockpit-cert-init
-  certInitializer:
-    nameOverride: so-cockpit-cert-init
-    credsPath: /opt/app/osaaf/local
-  cadi:
-    apiEnforcement: org.onap.so.monitoringPerm
   containerPort: *containerPort
 
 server:
@@ -108,54 +105,62 @@ server:
     # soMonitoringCredsExternalSecret: some secret
 
 service:
-#Since this is a feature for monitoring the service type is changed to internal, users can change it to NodePort on need basis...
-    type: NodePort
-    nodePort: 24
-    internalPort: *containerPort
-    externalPort: *containerPort
-    portName: http
+  type: NodePort
+  ports:
+    - port: *containerPort
+      name: http
+      nodePort: 24
+
 updateStrategy:
-    type: RollingUpdate
-    maxUnavailable: 1
-    maxSurge: 1
+  type: RollingUpdate
+  maxUnavailable: 1
+  maxSurge: 1
 # Resource Limit flavor -By Default using small
 flavor: small
 #Segregation for different environment (Small or large)
 resources:
-    small:
-        requests:
-            memory: 1Gi
-            cpu: 10m
-        limits:
-            memory: 4Gi
-            cpu: 1
-    large:
-        requests:
-            memory: 2Gi
-            cpu: 20m
-        limits:
-            memory: 8Gi
-            cpu: 2
+  small:
+    requests:
+      memory: 1Gi
+      cpu: 0.5
+    limits:
+      memory: 4Gi
+      cpu: 1
+  large:
+    requests:
+      memory: 2Gi
+      cpu: 1
+    limits:
+      memory: 8Gi
+      cpu: 2
+  unlimited: {}
 readinessProbe:
-    port: 9091
-    initialDelaySeconds: 20
-    periodSeconds: 10
-    timeoutSeconds: 10
+  port: 9091
+  initialDelaySeconds: 40
+  periodSeconds: 10
+  timeoutSeconds: 10
 livenessProbe:
-    port: 9091
-    initialDelaySeconds: 40
-    periodSeconds: 10
-    timeoutSeconds: 10
-    successThreshold: 1
-    failureThreshold: 3
+  port: 9091
+  initialDelaySeconds: 80
+  periodSeconds: 10
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
 ingress:
-    enabled: false
-    service:
-        - baseaddr: "soadmincockpit"
-          name: "so-admin-cockpit"
-          port: 9091
-    config:
-        ssl: "none"
+  enabled: false
+  service:
+  - baseaddr: "so-admin-cockpit-ui"
+    name: "so-admin-cockpit"
+    port: 9091
+  config:
+    ssl: "none"
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: portal-app-read
+      - serviceAccount: so-read
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
 nodeSelector: {}
 tolerations: []
 affinity: {}