diff options
Diffstat (limited to 'kubernetes')
23 files changed, 58 insertions, 73 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile index f96a32a4f0..1b24a7962c 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -88,7 +88,7 @@ plugins: @cp -R helm $(PACKAGE_DIR)/ check-for-staging-images: - $(ROOT_DIR)/contrib/tools/check-for-staging-images.sh + $(ROOT_DIR)/../.ci/check-for-staging-images.sh helm-repo-update: @$(HELM_BIN) repo update diff --git a/kubernetes/common/certInitializer/templates/_certInitializer.yaml b/kubernetes/common/certInitializer/templates/_certInitializer.yaml index 32bba457ee..b1e85c00cc 100644 --- a/kubernetes/common/certInitializer/templates/_certInitializer.yaml +++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml @@ -84,12 +84,19 @@ env: - name: APP_FQI value: "{{ $initRoot.fqi }}" + {{- if $initRoot.aaf_namespace }} - name: aaf_locate_url - value: "https://aaf-locate.{{ $dot.Release.Namespace}}:8095" - - name: aaf_locator_container - value: "oom" + value: "https://aaf-locate.{{ $initRoot.aaf_namespace }}:8095" + - name: aaf_locator_container_ns + value: "{{ $initRoot.aaf_namespace }}" + {{- else }} + - name: aaf_locate_url + value: "https://aaf-locate.{{ $dot.Release.Namespace }}:8095" - name: aaf_locator_container_ns value: "{{ $dot.Release.Namespace }}" + {{- end }} + - name: aaf_locator_container + value: "oom" - name: aaf_locator_fqdn value: "{{ $initRoot.fqdn }}" - name: aaf_locator_app_ns @@ -183,7 +190,7 @@ {{- define "common.certInitializer._volumes" -}} {{- $dot := default . .dot -}} {{- $initRoot := default $dot.Values.certInitializer .initRoot -}} -{{- $subchartDot := mergeOverwrite (deepCopy (omit $dot "Values")) (dict "Chart" (set (fromJson (toJson $dot.Chart)) "Name" $initRoot.nameOverride) "Values" (mergeOverwrite (deepCopy $initRoot) (dict "global" $dot.Values.global))) }} +{{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot))}} - name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }} emptyDir: medium: Memory diff --git a/kubernetes/common/common/templates/_utils.tpl b/kubernetes/common/common/templates/_utils.tpl index ece786f49f..52826c2bd2 100644 --- a/kubernetes/common/common/templates/_utils.tpl +++ b/kubernetes/common/common/templates/_utils.tpl @@ -36,6 +36,5 @@ Usage: {{- define "common.subChartDot" }} {{- $initRoot := .initRoot }} {{- $dot := .dot }} -{{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}} -{{ mergeOverwrite (deepCopy (omit $dot "Values")) (dict "Chart" (set (fromJson (toJson $dot.Chart)) "Name" $initRoot.nameOverride) "Values" (mergeOverwrite (deepCopy $initRoot) (dict "global" $dot.Values.global))) | toJson }} +{{ mergeOverwrite (deepCopy (omit $dot "Values" "Chart")) (dict "Chart" (set (set (fromJson (toJson $dot.Chart)) "Name" $initRoot.nameOverride) "Version" $dot.Chart.Version) "Values" (mergeOverwrite (deepCopy $initRoot) (dict "global" $dot.Values.global))) | toJson }} {{- end -}} diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl index 71201a1cc6..90c278e4c5 100644 --- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl +++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl @@ -83,10 +83,14 @@ {{- end }} env: - name: NAMESPACE + {{- if $subchartDot.Values.namespace }} + value: {{ $subchartDot.Values.namespace }} + {{- else }} valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace + {{- end }} resources: limits: cpu: {{ $subchartDot.Values.limits.cpu }} diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml index ee56577c63..e36ad4904c 100644 --- a/kubernetes/common/repositoryGenerator/values.yaml +++ b/kubernetes/common/repositoryGenerator/values.yaml @@ -24,12 +24,12 @@ global: # common global images busyboxImage: busybox:1.32 - curlImage: curlimages/curl:7.69.1 + curlImage: curlimages/curl:7.80.0 envsubstImage: dibi/envsubst:1 # there's only latest image for htpasswd htpasswdImage: xmartlabs/htpasswd:latest jettyImage: jetty:9-jdk11-slim - jreImage: onap/integration-java11:7.1.0 + jreImage: onap/integration-java11:10.0.0 kubectlImage: bitnami/kubectl:1.19 loggingImage: beats/filebeat:5.5.0 mariadbImage: bitnami/mariadb:10.6.5 diff --git a/kubernetes/contrib/tools/check-for-staging-images.sh b/kubernetes/contrib/tools/check-for-staging-images.sh deleted file mode 100755 index 9705ee6ea8..0000000000 --- a/kubernetes/contrib/tools/check-for-staging-images.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# Copyright © 2020 Samsung Electronics -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -BASE_URL="https://nexus3.onap.org/repository/docker.release" - -if [ "$GERRIT_BRANCH" = "staging" ]; then - exit 0 -fi - -USED_IMAGES=$(grep -r -E -o -h ':\s*onap/.*:.*' | sed -e 's/^: //' -e 's/^ //' | sort | uniq) -REPO_IMAGES=$(curl -s $BASE_URL/v2/_catalog | jq -r '.repositories[]') -NOT_AVAILABLE_IMAGES=$(echo "$USED_IMAGES" | grep -vE "$(echo "$REPO_IMAGES" | tr "\n" "|" | sed 's/|$//')") -USED_IMAGES=$(echo "$USED_IMAGES" | grep -E "$(echo "$REPO_IMAGES" | tr "\n" "|" | sed 's/|$//')") -for i in $USED_IMAGES; do - TMP_IMG=$(echo "$i" | cut -d ":" -f1) - TMP_TAG=$(echo "$i" | cut -d ":" -f2) - if [ "$LAST_IMG" != "$TMP_IMG" ]; then - AVAILABLE_TAGS=$(curl -s $BASE_URL/v2/$TMP_IMG/tags/list | jq -r '.tags[]') - fi - if ! echo "$AVAILABLE_TAGS" | grep "$TMP_TAG" > /dev/null; then - NOT_AVAILABLE_IMAGES="$NOT_AVAILABLE_IMAGES\n$i" - fi - LAST_IMG="$TMP_IMG" - printf "." -done -printf "\n" -if [ -n "$NOT_AVAILABLE_IMAGES" ]; then - echo "[ERROR] Only release images are allowed in helm charts." - echo "[ERROR] Images not found in release repo:" - printf "%b$NOT_AVAILABLE_IMAGES\n" - exit 1 -fi -exit 0 diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml index ad29e33a90..66c781cb3b 100644 --- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml @@ -107,6 +107,10 @@ credentials: uid: *controllerCredsUID key: password +# application environments +applicationEnv: + LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true' + # Initial Application Configuration applicationConfig: collector.rcc.appDescription: DCAE RestConf Collector Application diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml index f863ff8641..31007f2dde 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml @@ -107,6 +107,7 @@ service: # application environments applicationEnv: CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml' + LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true' # initial application configuration applicationConfig: diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml index a7186a4d98..93214d3057 100644 --- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml @@ -70,6 +70,9 @@ service: port: 80 port_protocol: http +# application environments +applicationEnv: + LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true' # Initial Application Configuration applicationConfig: diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml index 7cedbf89d1..ebb5f7e392 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/templates/statefulset.yaml @@ -169,6 +169,12 @@ spec: value: "{{ include "common.kafkaNodes" (dict "dot" . "replicaCount" .Values.zookeeper.replicaCount "componentName" .Values.zookeeper.name "port" .Values.zookeeper.port ) }}" - name: KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE value: "{{ .Values.kafka.enableSupport }}" + - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR + value: "{{ .Values.config.offsets_topic_replication_factor | default .Values.replicaCount }}" + - name: KAFKA_NUM_PARTITIONS + value: "{{ .Values.config.num_partition | default .Values.replicaCount }}" + - name: KAFKA_DEFAULT_REPLICATION_FACTOR + value: "{{ .Values.config.default_replication_factor | default .Values.replicaCount }}" {{- if .Values.global.aafEnabled }} - name: KAFKA_OPTS value: "{{ .Values.kafka.jaasOptionsAaf }}" diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml index 16a4c0fccb..be0de969c1 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/values.yaml @@ -77,17 +77,18 @@ kafka: interBrokerListernerAaf: INTERNAL_SASL_PLAINTEXT interBrokerListerner: INTERNAL_PLAINTEXT +config: {} + # offsets_topic_replication_factor: + # num_partition: + # default_replication_factor: configurationOverrides: - "offsets.topic.replication.factor": "3" "log.dirs": "/var/lib/kafka/data" "log.retention.hours": "168" - "num.partitions": "3" "transaction.state.log.replication.factor": "1" "transaction.state.log.min.isr": "1" "num.recovery.threads.per.data.dir": "5" "zookeeper.connection.timeout.ms": "6000" - "default.replication.factor": "3" "zookeeper.set.acl": "true" jmx: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index aecac0f71a..1b6099a0cd 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -81,7 +81,7 @@ global: busyboxImage: busybox:1.32 # curl image - curlImage: curlimages/curl:7.69.1 + curlImage: curlimages/curl:7.80.0 # env substitution image envsubstImage: dibi/envsubst:1 @@ -112,7 +112,7 @@ global: pullPolicy: Always # default java image - jreImage: onap/integration-java11:7.2.0 + jreImage: onap/integration-java11:10.0.0 # default clusterName # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }} diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml index 26ed0a77eb..43ec1d7e62 100755 --- a/kubernetes/policy/components/policy-api/values.yaml +++ b/kubernetes/policy/components/policy-api/values.yaml @@ -93,7 +93,7 @@ db: internalPort: 3306 restServer: - user: healthcheck + user: policyadmin password: none # default number of instances diff --git a/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties b/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties index aa9870ae41..cd6c6faa03 100644 --- a/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties +++ b/kubernetes/policy/components/policy-clamp-be/resources/config/application.properties @@ -53,10 +53,10 @@ clamp.config.files.sdcController=file:/opt/policy/clamp/sdc-controllers-config-p # # Configuration Settings for Policy Engine Components clamp.config.policy.api.url=https://policy-api.{{ include "common.namespace" . }}:6969 -clamp.config.policy.api.userName=healthcheck +clamp.config.policy.api.userName=policyadmin clamp.config.policy.api.password=zb!XztG34 clamp.config.policy.pap.url=https://policy-pap.{{ include "common.namespace" . }}:6969 -clamp.config.policy.pap.userName=healthcheck +clamp.config.policy.pap.userName=policyadmin clamp.config.policy.pap.password=zb!XztG34 #DCAE Inventory Url Properties diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml index 791b785502..a831da8df4 100644 --- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml +++ b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml @@ -89,10 +89,10 @@ replicaCount: 1 # application configuration restServer: api: - user: healthcheck + user: policyadmin password: none pap: - user: healthcheck + user: policyadmin password: none nodeSelector: {} diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml index 2d80fbb216..ef676bb2c4 100755 --- a/kubernetes/policy/components/policy-distribution/values.yaml +++ b/kubernetes/policy/components/policy-distribution/values.yaml @@ -79,10 +79,10 @@ restServer: user: healthcheck password: zb!XztG34 apiParameters: - user: healthcheck + user: policyadmin password: zb!XztG34 papParameters: - user: healthcheck + user: policyadmin password: zb!XztG34 sdcBe: user: policy diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml index fa0fda80e1..4d7c0f2fac 100755 --- a/kubernetes/policy/components/policy-drools-pdp/values.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml @@ -124,7 +124,7 @@ db: password: policy_user pap: - user: healthcheck + user: policyadmin password: zb!XztG34 pdp: diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml index d7135524d3..e7db99e2c6 100755 --- a/kubernetes/policy/components/policy-pap/values.yaml +++ b/kubernetes/policy/components/policy-pap/values.yaml @@ -108,12 +108,12 @@ db: internalPort: 3306 restServer: - user: healthcheck + user: policyadmin password: none healthCheckRestClient: api: - user: healthcheck + user: policyadmin password: none distribution: user: healthcheck diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml index 7c2d1b13a8..2007ab29c6 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml @@ -103,7 +103,7 @@ restServer: password: zb!XztG34 apiServer: - user: healthcheck + user: policyadmin password: zb!XztG34 # default number of instances diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 5204aa7568..851c8957ae 100755 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -183,9 +183,9 @@ mariadb-galera: nameOverride: *policy-mariadb restServer: - policyPapUserName: healthcheck + policyPapUserName: policyadmin policyPapUserPassword: zb!XztG34 - policyApiUserName: healthcheck + policyApiUserName: policyadmin policyApiUserPassword: zb!XztG34 # Resource Limit flavor -By Default using small diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml index 69b0fd3bb8..b788a36248 100644 --- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml @@ -79,6 +79,8 @@ spec: value: "{{ .Values.config.configDir }}" - name: SDNC_CONFIG_DIR value: "{{ .Values.config.configDir }}" + - name: LOG4J_FORMAT_MSG_NO_LOOKUPS + value: "true" volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml index 603f3a3f99..a23a6af460 100644 --- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml +++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml @@ -84,6 +84,8 @@ spec: value: "{{ .Values.config.configDir }}" - name: SDNC_CONFIG_DIR value: "{{ .Values.config.configDir }}" + - name: LOG4J_FORMAT_MSG_NO_LOOKUPS + value: "true" volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index f53c41c0f5..d252c9a3fb 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -285,6 +285,8 @@ spec: value: "{{ .Values.config.javaHome}}" - name: JAVA_OPTS value: "-Xms{{.Values.config.odl.javaOptions.minMemory}} -Xmx{{.Values.config.odl.javaOptions.maxMemory}}" + - name: LOG4J_FORMAT_MSG_NO_LOOKUPS + value: "true" - name: KARAF_CONSOLE_LOG_LEVEL value: "{{ include "common.log.level" . }}" - name: SDNRWT |