X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fsimulator-group%2Fdmaapmr%2Fapp.yaml;h=3dc83e83588a6a438989b1e4133c6e9a4b01bef3;hb=refs%2Fchanges%2F89%2F10889%2F2;hp=01c9014b37eade5c0754dcb38cb0475588f9d368;hpb=79e37003f5c94bfe12d197727dd31334e50397a6;p=nonrtric.git diff --git a/test/simulator-group/dmaapmr/app.yaml b/test/simulator-group/dmaapmr/app.yaml index 01c9014b..3dc83e83 100644 --- a/test/simulator-group/dmaapmr/app.yaml +++ b/test/simulator-group/dmaapmr/app.yaml @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2020-2023 Nordix Foundation +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= apiVersion: apps/v1 kind: Deployment metadata: @@ -80,6 +97,8 @@ spec: ports: - name: http containerPort: $MR_KAFKA_PORT + - name: http-external + containerPort: $MR_KAFKA_KUBE_NODE_PORT env: - name: enableCadi value: 'false' @@ -90,11 +109,11 @@ spec: - name: KAFKA_ZOOKEEPER_SESSION_TIMEOUT_MS value: '40000' - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP - value: 'INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT' + value: 'INTERNAL_PLAINTEXT:PLAINTEXT,EXTERNAL_PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT' - name: KAFKA_ADVERTISED_LISTENERS - value: 'INTERNAL_PLAINTEXT://$MR_KAFKA_SERVICE_PATH' + value: 'INTERNAL_PLAINTEXT://$MR_KAFKA_SERVICE_PATH,PLAINTEXT_HOST://localhost:$MR_KAFKA_KUBE_NODE_PORT' - name: KAFKA_LISTENERS - value: 'INTERNAL_PLAINTEXT://0.0.0.0:$MR_KAFKA_PORT' + value: 'INTERNAL_PLAINTEXT://0.0.0.0:$MR_KAFKA_PORT,PLAINTEXT_HOST://0.0.0.0:$MR_KAFKA_KUBE_NODE_PORT' - name: KAFKA_INTER_BROKER_LISTENER_NAME value: INTERNAL_PLAINTEXT - name: KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE @@ -111,6 +130,10 @@ spec: - mountPath: /etc/kafka/secrets/jaas/zk_client_jaas.conf subPath: zk_client_jaas.conf name: dmaapmr-zk-client-jaas + initContainers: + - name: init-kafka + image: busybox + command: ['sh', '-c', 'until nslookup $MR_ZOOKEEPER_APP_NAME.$KUBE_ONAP_NAMESPACE.svc.cluster.local; do echo waiting for $MR_ZOOKEEPER_APP_NAME; sleep 2; done;'] volumes: - configMap: defaultMode: 420 @@ -158,6 +181,10 @@ spec: - mountPath: /appl/dmaapMR1/etc/cadi.properties subPath: cadi.properties name: dmaapmr-cadi + initContainers: + - name: init-dmaap-mr + image: busybox + command: ['sh', '-c', 'until nslookup $MR_KAFKA_APP_NAME.$KUBE_ONAP_NAMESPACE.svc.cluster.local; do echo waiting for $MR_KAFKA_APP_NAME; sleep 2; done;'] volumes: - configMap: defaultMode: 420