summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2022-04-07 16:03:42 +0000
committerGerrit Code Review <gerrit@onap.org>2022-04-07 16:03:42 +0000
commitf13a534c4e8e3abd2602748243ec70e705558277 (patch)
tree37786929d63f8470075280cdcd6c562f49211d46
parentd719ef17926ee176461304123f3948a3c9e95845 (diff)
parentdf4fc03d8540b4c1ee10b440b4f7d5b20d8e2685 (diff)
Merge "[MULTICLOUD] Changes for Jakarta release"
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml12
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml3
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/values.yaml4
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml12
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml3
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/values.yaml5
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml14
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml3
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/values.yaml7
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml12
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml3
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/values.yaml7
-rw-r--r--kubernetes/multicloud/values.yaml4
14 files changed, 67 insertions, 27 deletions
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 fe2eb68a3e..889dabeb73 100644
--- 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 fc46a65052..f71255bc5f 100644
--- 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 b664498eb8..21be9d38cb 100644
--- 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 bf9dbf55d4..844ac5e58d 100644
--- 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 e740dccce3..9c82852f79 100644
--- 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 ebebaace3c..a802cb1466 100644
--- 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 45c73099dd..7b606a5492 100644
--- 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 05989ac9b4..243e51e665 100644
--- 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 c9209a0c09..2524cd8421 100644
--- 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 b3387c6c3a..e59f34a8bc 100644
--- 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 7488188cdc..80792c9c70 100644
--- 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 dfb4bbc98c..7656632737 100644
--- 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 ad50b4010f..1a6527b4cb 100644
--- 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 c4c95a4d62..977de08b6a 100644
--- 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