commit 50d29a32cadf7c8c91e3409d8d604cc4852dadb4
author Krzysztof Opasiak <k.opasiak@samsung.com> Fri Dec 18 09:40:52 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Fri Dec 18 09:40:52 2020 +0000
tree 70488e7a277795998b91896aa2e91cd8d1dd5643
parent e0b9465863adbd590e82adb09928c623f0664277
parent 145140b968430f5ac62ec72499b36d40f708054a

Merge "[COMMON][CertInit] Uses new tpls for repos / images"

kubernetes/onap/resources/overrides/onap-all.yaml

diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 1d0663e..13b90ac 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -20,6 +20,7 @@
 global:
   addTestingComponents: &testing true
   centralizedLoggingEnabled: &centralizedLogging false
+  CMPv2CertManagerIntegration: false
 cassandra:
   enabled: true
 mariadb-galera:
@@ -84,4 +85,4 @@
 platform:
   enabled: true
 a1policymanagement:
-  enabled: true
\ No newline at end of file
+  enabled: true

kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml

diff --git a/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
index 9914e14..643d306 100644
--- a/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
+++ b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
@@ -35,6 +35,7 @@
 #################################################################
 global:
   cmpv2Enabled: true
+  CMPv2CertManagerIntegration: true
   platform:
     certServiceClient:
       envVariables:

kubernetes/sdnc/resources/config/bin/installSdncDb.sh

diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
index caf745c..11ed7f4 100755
--- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
+++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
@@ -65,7 +65,7 @@
 if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
 then
     echo "Installing directed graphs"
-     ${SDNC_HOME}/svclogic/bin/install.sh
+    ${SDNC_HOME}/svclogic/bin/install.sh
 fi
 
 

kubernetes/sdnc/templates/job.yaml

diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 897a0ba..9f6273d 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -25,10 +25,6 @@
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": before-hook-creation
 spec:
   backoffLimit: 20
   template: