X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcontrib%2Fcomponents%2Fejbca%2Fvalues.yaml;h=b777a7d388c1da03789396c3abc0d3f748073550;hb=8c26e59d30a185186cf33988a0dbb859409f73eb;hp=1a9a34bcd164cc7d4a6dbb53b9e961d8cadd0b8c;hpb=066d0396971bd11ca6456ec8385e2126e7229457;p=oom.git

diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
index 1a9a34bcd1..b777a7d388 100644
--- a/kubernetes/contrib/components/ejbca/values.yaml
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 global:
-  readinessImage: onap/oom/readiness:3.0.1
   mariadbGalera: &mariadbGalera
     #This flag allows EJBCA to instantiate its own mariadb-galera cluster
     localCluster: false
@@ -37,7 +36,6 @@ secrets:
     password: '{{ .Values.config.ejbca.clientIak }}'
 
 # application configuration
-repository: nexus3.onap.org:10001
 config:
   db:
     userName: ejbca
@@ -56,16 +54,14 @@ mysqlDatabase: &dbName ejbca
 replicaCount: 1
 
 ejbca:
-  image: primekey/ejbca-ce:6.15.2.5
+  image: primekey/ejbca-ce:7.4.3.2
 pullPolicy: Always
 
 mariadb-galera:
-  # '&mariadbConfig' means we "store" the values for  later use in the file
-  # with '*mariadbConfig' pointer.
-  config: &mariadbConfig
-    userCredentialsExternalSecret: *ejbca-db-secret
-    mysqlDatabase: *dbName
-  nameOverride: ejbca-galera
+  db:
+    externalSecret: *ejbca-db-secret
+    name: *dbName
+  nameOverride: &ejbca-galera ejbca-galera
   service:
     name: ejbca-galera
     portName: ejbca-galera
@@ -74,9 +70,13 @@ mariadb-galera:
   persistence:
     enabled: true
     mountSubPath: ejbca/maria/data
+  serviceAccount:
+    nameOverride: *ejbca-galera
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *ejbca-db-secret
+    mysqlDatabase: *dbName
   nameOverride: ejbca-config
 
 nodeSelector: {}
@@ -86,14 +86,14 @@ affinity: {}
 # probe configuration parameters
 liveness:
   path: /ejbca/publicweb/healthcheck/ejbcahealth
-  port: api
-  initialDelaySeconds: 30
+  port: 8443
+  initialDelaySeconds: 180
   periodSeconds: 30
 
 readiness:
   path: /ejbca/publicweb/healthcheck/ejbcahealth
-  port: api
-  initialDelaySeconds: 30
+  port: 8443
+  initialDelaySeconds: 180
   periodSeconds: 30
 
 service:
@@ -104,3 +104,29 @@ service:
       port: 8443
       plain_port: 8080
       port_protocol: http
+
+# Resource Limit flavor -By Default using small
+flavor: unlimited
+# Segregation for Different environment (Small and Large)
+resources:
+  small:
+    limits:
+      cpu: 1500m
+      memory: 1536Mi
+    requests:
+      cpu: 10m
+      memory: 750Mi
+  large:
+    limits:
+      cpu: 2
+      memory: 2Gi
+    requests:
+      cpu: 20m
+      memory: 1Gi
+  unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: ejbca
+  roles:
+    - read