Merge "[CMPV2] Add a template for Certificate (cert-manager)"

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 51c28c2..2c1e48e 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -78,6 +78,8 @@ openssl algorithm that works with the python based Robot Framework.
     cd so/resources/config/mso/
     /oom/kubernetes/so/resources/config/mso# echo -n "<openstack tenant password>" | openssl aes-128-ecb -e -K `cat encryption.key` -nosalt | xxd -c 256 -p``
 
+  Use OS_PASSWORD value from openstack .RC file for "openstack tenant password"
+
 c. Generating SO Encrypted Password:
 The SO Encrypted Password uses a java based encryption utility since the
 Java encryption library is not easy to integrate with openssl/python that
@@ -87,7 +89,7 @@ Robot uses in Dublin and upper versions.
   To generate SO ``openStackEncryptedPasswordHere`` and ``openStackSoEncryptedPassword``
   ensure `default-jdk` is installed::
 
-    apt-get update; apt-get install default-jdk
+    sudo apt-get update; sudo apt-get install default-jdk
 
   Then execute::
 
@@ -130,6 +132,10 @@ observe the following constraints.
   deployment need not worry about this setting but for the demonstration VNFs
   the ip asssignment strategy assumes 10.0 ip prefix.
 
+.. note::
+  Copy below required openstack.yaml file and update the parameters for the variables
+  accordingly from openstack environment (openrc file) and replace
+
 Example Keystone v2.0
 
 .. literalinclude:: example-integration-override.yaml
@@ -246,4 +252,17 @@ for use::
 
   > helm undeploy dev --purge
 
+.. note::
+  After undeploy follow the below steps to cleanup everything before redeplying ONAP
+
+::
+
+  > kubectl delete namespace onap
+
+  > kubectl delete pv -n onap --all
+
+  > kubectl delete pvc -n onap --all
+
+  > sudo rm -rf /dockerdata-nfs/*
+
 More examples of using the deploy and undeploy plugins can be found here: https://wiki.onap.org/display/DW/OOM+Helm+%28un%29Deploy+plugins

diff --git a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
index f321e54..9645b20 100755 (executable)
--- a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
@@ -109,11 +109,8 @@ spec:
           env:
           - name: APP_CONFIG_HOME
             value: {{ .Values.config.appConfigDir }}
-          - name: USE_SCRIPT_COMPILE_CACHE
-            value: {{ .Values.config.useScriptCompileCache | quote }}
-          # Cluster should only be enabled when replicaCount is more than 2 and useScriptCompileCache is set to false otherwise it won't work properly
           - name: CLUSTER_ENABLED
-            value: {{ if and (gt (int (.Values.replicaCount)) 2) (not .Values.config.useScriptCompileCache) }} {{ .Values.cluster.enabled | quote }} {{ else }} "false" {{ end }}
+            value: {{ if (gt (int (.Values.replicaCount)) 2) }} {{ .Values.cluster.enabled | quote }} {{ else }} "false" {{ end }}
           - name: CLUSTER_ID
             value: {{ .Values.cluster.clusterName }}
           - name: CLUSTER_NODE_ID

diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 629b825..1b45698 100755 (executable)
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -60,7 +60,6 @@ debugEnabled: false
 # application configuration
 config:
   appConfigDir: /opt/app/onap/config
-  useScriptCompileCache: false
   sdncDB:
     dbService: mariadb-galera
     dbPort: 3306
@@ -130,7 +129,6 @@ persistence:
 
 cluster:
   # Cannot have cluster enabled if the replicaCount is not at least 3
-  # AND config value useScriptCompileCache is not set to false
   enabled: true
 
   clusterName: cds-cluster

diff --git a/kubernetes/common/cmpv2Config/values.yaml b/kubernetes/common/cmpv2Config/values.yaml
index c22f973..19b87b1 100644 (file)
--- a/kubernetes/common/cmpv2Config/values.yaml
+++ b/kubernetes/common/cmpv2Config/values.yaml
@@ -14,7 +14,7 @@
 global:
   platform:
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.1
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.2
       secretName: oom-cert-service-client-tls-secret
       envVariables:
         # Certificate related
@@ -29,5 +29,5 @@ global:
         keystorePassword: "secret"
         truststorePassword: "secret"
     certPostProcessor:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.3.1
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.3.2
 

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index a3bff07..bbc0611 100644 (file)
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -103,7 +103,7 @@ mongo:
   disableNfsProvisioner: true
 
 # application image
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:2.2.1
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:2.2.3
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager

diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
index c13d3ce..e187e11 100644 (file)
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
@@ -49,7 +49,7 @@ config:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/org.onap.dcaegen2.deployments.cm-container:3.4.1
+image: onap/org.onap.dcaegen2.deployments.cm-container:3.4.2
 pullPolicy: Always
 
 # name of shared ConfigMap with kubeconfig for multiple clusters

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index c416f0d..5376940 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -202,7 +202,7 @@ global:
   CMPv2CertManagerIntegration: false
   platform:
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.1
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.2
       secret:
         name: oom-cert-service-client-tls-secret
         mountPath: /etc/onap/oom/certservice/certs/

diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index 990c36d..0614819 100644 (file)
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -38,7 +38,7 @@ service:
 # 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.3.2
   proxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
   # fol local development use IfNotPresent
   pullPolicy: Always

diff --git a/kubernetes/platform/components/oom-cert-service/values.yaml b/kubernetes/platform/components/oom-cert-service/values.yaml
index bd415c0..8f31124 100644 (file)
--- a/kubernetes/platform/components/oom-cert-service/values.yaml
+++ b/kubernetes/platform/components/oom-cert-service/values.yaml
@@ -38,7 +38,7 @@ certificateGenerationImage: onap/integration-java11:7.2.0
 
 # Deployment configuration
 repository: "nexus3.onap.org:10001"
-image: onap/org.onap.oom.platform.cert-service.oom-certservice-api:2.3.1
+image: onap/org.onap.oom.platform.cert-service.oom-certservice-api:2.3.2
 pullPolicy: Always
 replicaCount: 1
 

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 44e1791..1d2fa26 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -35,7 +35,7 @@ global:
   CMPv2CertManagerIntegration: false
   platform:
     certServiceClient:
-      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.1
+      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.2
       secret:
         name: oom-cert-service-client-tls-secret
         mountPath: /etc/onap/oom/certservice/certs/