summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/onap/resources/overrides/onap-all.yaml3
-rw-r--r--kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml1
-rwxr-xr-xkubernetes/sdnc/resources/config/bin/installSdncDb.sh2
-rwxr-xr-xkubernetes/sdnc/templates/job.yaml4
4 files changed, 4 insertions, 6 deletions
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 1d0663ea65..13b90ac45e 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 @@ modeling:
platform:
enabled: true
a1policymanagement:
- enabled: true \ No newline at end of file
+ enabled: true
diff --git a/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml b/kubernetes/onap/resources/overrides/oom-cert-service-environment.yaml
index 9914e1496e..643d3065c1 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:
diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
index caf745c9d3..11ed7f45bf 100755
--- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
+++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh
@@ -65,7 +65,7 @@ ${BIN_DIR}/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL
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
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 897a0bac7e..9f6273d5ff 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -25,10 +25,6 @@ metadata:
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: