Merge "[DCAEMOD] Uses new tpls for repos / images"

[oom.git] / kubernetes / oof / components / oof-has / values.yaml

diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index 6678073..1389044 100755 (executable)
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -17,17 +17,22 @@
 # Global configuration defaults.
 #################################################################
 global:
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  repository: nexus3.onap.org:10001
   commonConfigPrefix: onap-oof-has
   image:
-    optf_has: onap/optf-has:2.0.4
-    filebeat: docker.elastic.co/beats/filebeat:5.5.0
+    optf_has: onap/optf-has:2.1.2
   persistence:
     enabled: true
 
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - uid: oof-onap-certs
+    name: &oof-certs  '{{ include "common.release" . }}-oof-onap-certs'
+    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
+    type: generic
+    filePaths: '{{ .Values.secretsFilePaths }}'
+
 pullPolicy: Always
 nodePortPrefix: 302
 dataRootDir: /dockerdata-nfs
@@ -70,12 +75,17 @@ resources:
 #component overrides
 oof-has-api:
   enabled: true
+  certSecret: *oof-certs
 oof-has-controller:
   enabled: true
+  certSecret: *oof-certs
 oof-has-data:
   enabled: true
+  certSecret: *oof-certs
 oof-has-reservation:
   enabled: true
+  certSecret: *oof-certs
 oof-has-solver:
   enabled: true
+  certSecret: *oof-certs