Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / platform / components / cmpv2-cert-provider / values.yaml

diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index 990c36d..6d48efd 100644 (file)
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2020, Nokia
+# Copyright © 2020-2021, Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,55 +15,35 @@
 # Global
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
+  readinessImage: onap/oom/readiness:6.0.3
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
   busyboxRepository: registry.hub.docker.com
   busyboxImage: library/busybox:latest
   repository: "nexus3.onap.org:10001"
-  CMPv2CertManagerIntegration: false
 
 namespace: onap
 
 
-# Service configuration
-service:
-  name: oom-certservice-cmpv2issuer-metrics-service
-  type: ClusterIP
-  ports:
-    name: https
-    port: 8443
-    targetPort: https
-
 # Deployment configuration
 deployment:
   name: oom-certservice-cmpv2issuer
-  image: onap/org.onap.oom.platform.cert-service.oom-certservice-k8s-external-provider:2.3.0
+  image: onap/org.onap.oom.platform.cert-service.oom-certservice-k8s-external-provider:2.6.0
   proxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
   # fol local development use IfNotPresent
   pullPolicy: Always
   logLevel: debug
   resources:
     limits:
-      cpu: 250m
-      memory: 128Mi
-    requests:
-      cpu: 100m
-      memory: 64Mi
-deploymentProxy:
-  name: kube-rbac-proxy
-  image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
-  pullPolicy: IfNotPresent
-  resources:
-    limits:
-      cpu: 250m
-      memory: 128Mi
+      cpu: "250m"
+      memory: "100Mi"
     requests:
-      cpu: 50m
-      memory: 32Mi
+      cpu: "100m"
+      memory: "60Mi"
 readinessCheck:
   wait_for:
-    - oom-cert-service
+    services:
+      - oom-cert-service
 
 # CMPv2Issuer
 cmpv2issuer:
@@ -71,12 +51,13 @@ cmpv2issuer:
   url: https://oom-cert-service:8443
   healthcheckEndpoint: actuator/health
   certEndpoint: v1/certificate
+  updateEndpoint: v1/certificate-update
   caName: RA
   certSecretRef:
-    name: cmpv2-issuer-secret
-    certRef: certServiceServer-cert.pem
-    keyRef: certServiceServer-key.pem
-    cacertRef: truststore.pem
+    name: oom-cert-service-client-tls-secret
+    certRef: tls.crt
+    keyRef: tls.key
+    cacertRef: ca.crt