Merge "[DEPLOY] Use HELM_NS for kubectl commands"

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index d65c4f7..112b8c0 100644 (file)
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -465,7 +465,7 @@ persistence:
   accessMode: ReadWriteOnce
   ## Persistent Volume size
   ##
-  size: 2Gi
+  size: 3Gi
 
 ## Additional pod labels
 ##

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml
index fe2eb68..889dabe 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml
@@ -18,20 +18,24 @@ disable_existing_loggers: False
 
 loggers:
     fcaps:
-      handlers: [fcaps_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers: [fcaps_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [fcaps_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 
 handlers:
-    fcaps_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/fcaps/fcaps.log"

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index fc46a65..f71255b 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -90,6 +90,9 @@ spec:
      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.rabbitmq }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        name: rabbit-mq
+     - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
+       imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+       name: memcached
      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: fcaps-log

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index b664498..21be9d3 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -22,7 +22,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/openstack-fcaps:1.5.6
+image: onap/multicloud/openstack-fcaps:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -90,6 +90,9 @@ resources:
 # rabbit-mq image resource
 rabbitmq: rabbitmq:alpine
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-fcaps

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index bf9dbf5..844ac5e 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -18,13 +18,13 @@
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/k8s:0.9.3
+image: onap/multicloud/k8s:0.10.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
index e740dcc..9c82852 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
@@ -18,20 +18,24 @@ disable_existing_loggers: False
 
 loggers:
     pike:
-      handlers: [pike_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers: [pike_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [pike_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 
 handlers:
-    pike_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/pike/pike.log"

diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index ebebaac..a802cb1 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -89,6 +89,9 @@ spec:
        {{ end }}
      # side car containers
      {{ include "common.log.sidecar" . | nindent 5 }}
+     - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
+       imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+       name: memcached
      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: pike-log

diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index 45c7309..7b606a5 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -22,7 +22,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/openstack-pike:1.5.6
+image: onap/multicloud/openstack-pike:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -87,6 +87,9 @@ resources:
       memory: 2Gi
   unlimited: {}
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-pike

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
index 05989ac..243e51e 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
@@ -18,24 +18,28 @@ disable_existing_loggers: False
 
 loggers:
     starlingx_base:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     starlingx:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [starlingx_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 
 handlers:
-    starlingx_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/starlingx/starlingx.log"

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index c9209a0..2524cd8 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -88,6 +88,9 @@ spec:
         {{ end }}
       # side car containers
       {{ include "common.log.sidecar" . | nindent 7 }}
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: memcached
       - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
         name: framework-artifactbroker
         command: ["/opt/app/distribution/bin/artifact-dist.sh"]

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index b3387c6..e59f34a 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -17,14 +17,14 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-starlingx:1.5.6
+image: onap/multicloud/openstack-starlingx:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -89,6 +89,9 @@ resources:
       memory: 2Gi
   unlimited: {}
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-starlingx

diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
index 7488188..80792c9 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
@@ -18,20 +18,24 @@ disable_existing_loggers: False
 
 loggers:
     titanium_cloud:
-      handlers: [titanium_cloud_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers: [titanium_cloud_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [titanium_cloud_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 
 handlers:
-    titanium_cloud_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "standard"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/windriver/titanium_cloud.log"

diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index dfb4bbc..7656632 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -97,6 +97,9 @@ spec:
         {{ end }}
       # side car containers
       {{ include "common.log.sidecar" . | nindent 7 }}
+      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.memcached }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: memcached
       - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
         name: framework-artifactbroker
         command: ["/opt/app/distribution/bin/artifact-dist.sh"]

diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index ad50b40..1a6527b 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -18,14 +18,14 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
   persistence: {}
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/openstack-windriver:1.5.6
+image: onap/multicloud/openstack-windriver:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -98,6 +98,9 @@ resources:
       memory: 2Gi
   unlimited: {}
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-windriver

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index c4c95a4..977de08 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.2
+  artifactImage: onap/multicloud/framework-artifactbroker:1.7.3
   prometheus:
     enabled: false
   persistence: {}
@@ -28,7 +28,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/framework:1.7.1
+image: onap/multicloud/framework:1.7.3
 pullPolicy: Always
 
 #Istio sidecar injection policy

diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index d28b5ae..23610dd 100644 (file)
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -29,3 +29,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~10.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~10.x-0
+    repository: '@local'

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 3cbfb76..3beef06 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -295,6 +295,8 @@ if [ $dcaeRegistrySynch ]; then
      ./registry-initialize.sh -h dcaegen2-services-common -n $NAMESPACE -r $HELM_RELEASE
      ./registry-initialize.sh -h postgres -n $NAMESPACE -r $HELM_RELEASE
      ./registry-initialize.sh -h serviceAccount -n $NAMESPACE -r $HELM_RELEASE
+     ./registry-initialize.sh -h mongo -n $NAMESPACE -r $HELM_RELEASE
+     ./registry-initialize.sh -h common -n $NAMESPACE -r $HELM_RELEASE
    fi
    cd $CURRENT_DIR
 fi

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index b057fc7..7bba71f 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -462,3 +462,9 @@ persistence:
   size: 2Gi
   mountPath: /dockerdata-nfs
   mountSubPath: robot/logs
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: robot
+  roles:
+    - read
\ No newline at end of file

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index ec6f440..d5ff829 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -63,7 +63,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/bpmn-infra:1.9.2
+image: onap/so/bpmn-infra:1.10.0
 pullPolicy: Always
 
 bpmn:

diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 57c4902..a5961ee 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -62,7 +62,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/catalog-db-adapter:1.9.2
+image: onap/so/catalog-db-adapter:1.10.0
 pullPolicy: Always
 
 db:

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 2b6fff6..6d7eec4 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -76,7 +76,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-cnf-adapter:1.9.2
+image: onap/so/so-cnf-adapter:1.10.0
 pullPolicy: Always
 
 readinessCheck:

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 1faf890..057f8a0 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -58,7 +58,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/openstack-adapter:1.9.2
+image: onap/so/openstack-adapter:1.10.0
 pullPolicy: Always
 
 db:

diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index d49210f..e932a0b 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -58,7 +58,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/request-db-adapter:1.9.2
+image: onap/so/request-db-adapter:1.10.0
 pullPolicy: Always
 
 db:

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index e613950..58e93f5 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -58,7 +58,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdc-controller:1.9.2
+image: onap/so/sdc-controller:1.10.0
 pullPolicy: Always
 
 db:

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index d087b15..cb9d02a 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -72,7 +72,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdnc-adapter:1.9.2
+image: onap/so/sdnc-adapter:1.10.0
 pullPolicy: Always
 
 org:

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 18455e4..1f454f6 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -182,7 +182,7 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
-image: onap/so/api-handler-infra:1.9.2
+image: onap/so/api-handler-infra:1.10.0
 
 server:
   aaf:

diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index cfd2ef1..a94879b 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -46,6 +46,14 @@ spec:
         tls: true
         authentication:
           type: tls
+        configuration:
+          bootstrap:
+            nodePort: {{ .Values.global.nodePortPrefixExt }}91
+          brokers:
+            - broker: 0
+              nodePort: {{ .Values.global.nodePortPrefixExt }}92
+            - broker: 1
+              nodePort: {{ .Values.global.nodePortPrefixExt }}93
     authorization:
       type: simple
       superUsers:

diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index e8db803..9e63c2c 100644 (file)
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -16,7 +16,7 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
+  nodePortPrefixExt: 304
   persistence:
     mountPath: /dockerdata-nfs