diff options
Diffstat (limited to 'kubernetes')
25 files changed, 86 insertions, 35 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 diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml index d28b5ae0ff..23610ddd3c 100644 --- 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 3cbfb76646..3beef061ce 100755 --- 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 b057fc7304..7bba71fe0b 100644 --- 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 ec6f4408a0..d5ff829cc7 100755 --- 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 57c4902167..a5961ee7dd 100755 --- 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 2b6fff63c8..6d7eec4a64 100755 --- 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 1faf890e65..057f8a0a85 100755 --- 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 d49210fe37..e932a0b643 100755 --- 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 e613950fe8..58e93f53af 100755 --- 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 d087b15a9d..cb9d02ae05 100755 --- 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 18455e4129..1f454f63df 100755 --- 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: |