From: halil.cakal Date: Fri, 17 Oct 2025 15:38:26 +0000 (+0100) Subject: modified pod and service names (split-5) X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfc116a0ad511d64e8d65ad65875c17f5bf3bde1;p=cps.git modified pod and service names (split-5) - addressed review on pod and service names: https://gerrit.onap.org/r/c/cps/+/142226 - pod and service names was repeating itself before this changets made: before: they were cps-cps-and-ncmp-cps, cps-cps-and-ncmp-dmi-stub, cps-cps-and-ncmp-postgresql, and cps-cps-and-ncmp-zookeeper after: cps-ncmp, cps-ncmp-dmi-stub, cps-ncmp-postgresql, cps-ncmp-zookeeper - changed imagePullPolicy from Always to IfNotPresent for cps-and-ncmp Issue-ID: CPS-2967 Change-Id: I64b9d34b1a8359a5d26d209c57912d6ef408b8df Signed-off-by: halil.cakal --- diff --git a/cps-charts/Chart.yaml b/cps-charts/Chart.yaml index 4078b2c3a9..892a77e4a2 100644 --- a/cps-charts/Chart.yaml +++ b/cps-charts/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: cps-and-ncmp +name: ncmp description: Helm chart for CPS and NCMP for testing purposes version: 0.1.0 type: application diff --git a/cps-charts/README.md b/cps-charts/README.md index f80363fde9..3bee52b5ea 100644 --- a/cps-charts/README.md +++ b/cps-charts/README.md @@ -35,7 +35,7 @@ helm install cps ./ Replace with the path to this Helm chart. You can verify the deployment using: ```bash -kubectl get all -l app=cps-and-ncmp +kubectl get all -l app=ncmp ``` --- ## Uninstallation @@ -49,14 +49,14 @@ You can access the services locally using kubectl port-forward. --- ## CPS and NCMP (API) Service ```bash -kubectl port-forward service/cps-cps-and-ncmp-cps 8080:8080 +kubectl port-forward service/cps-ncmp 8080:8080 ``` Once port forwarding is active, you can access the CPS/NCMP API at: http://localhost:8080 --- ## DMI Stub Service ```bash -kubectl port-forward service/cps-cps-and-ncmp-dmi-stub 8092:8092 +kubectl port-forward service/cps-ncmp-dmi-stub 8092:8092 ``` Access the DMI stub API at: http://localhost:8092 diff --git a/cps-charts/templates/cps-deployment.yaml b/cps-charts/templates/cps-deployment.yaml index 604b1bbbdf..6c1336251c 100644 --- a/cps-charts/templates/cps-deployment.yaml +++ b/cps-charts/templates/cps-deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "cps-and-ncmp.fullname" . }}-cps + name: {{ include "cps-and-ncmp.fullname" . }} labels: app: {{ include "cps-and-ncmp.name" . }} component: cps-and-ncmp @@ -31,7 +31,7 @@ spec: value: "{{ $envValue }}" {{- end }} - name: CPS_NCMP_SERVICE_NAME - value: {{ include "cps-and-ncmp.name" . }}-cps-hazelcast + value: cps-{{ include "cps-and-ncmp.name" . }}-hazelcast resources: requests: cpu: {{ .Values.cps.resources.requests.cpu }} diff --git a/cps-charts/templates/cps-hazelcast-service.yaml b/cps-charts/templates/cps-hazelcast-service.yaml index 2385b409af..9945c92c59 100644 --- a/cps-charts/templates/cps-hazelcast-service.yaml +++ b/cps-charts/templates/cps-hazelcast-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "cps-and-ncmp.name" . }}-cps-hazelcast + name: cps-{{ include "cps-and-ncmp.name" . }}-hazelcast labels: app: {{ include "cps-and-ncmp.name" . }} component: cps-and-ncmp diff --git a/cps-charts/templates/cps-service.yaml b/cps-charts/templates/cps-service.yaml index de8bffd3a2..5b84d475e2 100644 --- a/cps-charts/templates/cps-service.yaml +++ b/cps-charts/templates/cps-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "cps-and-ncmp.fullname" . }}-cps + name: {{ include "cps-and-ncmp.fullname" . }} labels: app: {{ include "cps-and-ncmp.name" . }} component: cps-and-ncmp diff --git a/cps-charts/values.yaml b/cps-charts/values.yaml index dd0c362b48..72f040d0ed 100644 --- a/cps-charts/values.yaml +++ b/cps-charts/values.yaml @@ -21,7 +21,7 @@ cps: image: repository: "nexus3.onap.org:10003/onap/cps-and-ncmp" tag: "latest" - pullPolicy: Always + pullPolicy: IfNotPresent replicas: 2 servicePort: 8080 service: @@ -36,12 +36,12 @@ cps: cpu: "6000m" memory: "5Gi" env: - DB_HOST: "cps-cps-and-ncmp-postgresql" + DB_HOST: "cps-ncmp-postgresql" DB_USERNAME: "cps" DB_PASSWORD: "cps" DMI_USERNAME: "cpsuser" DMI_PASSWORD: "cpsr0cks!" - KAFKA_BOOTSTRAP_SERVER: "cps-cps-and-ncmp-kafka.default.svc.cluster.local:9092" + KAFKA_BOOTSTRAP_SERVER: "cps-ncmp-kafka.default.svc.cluster.local:9092" notification_enabled: "true" ONAP_TRACING_ENABLED: "false" ONAP_OTEL_SAMPLER_JAEGER_REMOTE_ENDPOINT: "http://jaeger-service:14250" @@ -71,10 +71,10 @@ kafka: external: 9093 nodePorts: external: 30093 - zookeeperConnect: "cps-cps-and-ncmp-zookeeper.default.svc.cluster.local" + zookeeperConnect: "cps-ncmp-zookeeper.default.svc.cluster.local" brokerId: 1 listeners: "INTERNAL://0.0.0.0:29092,EXTERNAL://0.0.0.0:9092,NODEPORT://0.0.0.0:9093" - advertisedListeners: "INTERNAL://localhost:29092,EXTERNAL://cps-cps-and-ncmp-kafka:9092,NODEPORT://localhost:30093" + advertisedListeners: "INTERNAL://localhost:29092,EXTERNAL://cps-ncmp-kafka:9092,NODEPORT://localhost:30093" interBrokerListenerName: "INTERNAL" listenerSecurityProtocolMap: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,NODEPORT:PLAINTEXT" offsetsTopicReplicationFactor: 1 @@ -88,7 +88,7 @@ kafka: healthcheck: enabled: true command: > - kafka-topics --bootstrap-server cps-cps-and-ncmp-kafka:29092 --list || exit 1 + kafka-topics --bootstrap-server cps-ncmp-kafka:29092 --list || exit 1 interval: 10 timeout: 10 retries: 3 @@ -133,7 +133,7 @@ dmiStub: nodePort: 30092 containerPort: 8092 env: - KAFKA_BOOTSTRAP_SERVER: "cps-cps-and-ncmp-kafka.default.svc.cluster.local:9092" + KAFKA_BOOTSTRAP_SERVER: "cps-ncmp-kafka.default.svc.cluster.local:9092" NCMP_CONSUMER_GROUP_ID: "ncmp-group" NCMP_ASYNC_M2M_TOPIC: "ncmp-async-m2m" MODULE_INITIAL_PROCESSING_DELAY_MS: 180000 diff --git a/k6-tests/k6-main.sh b/k6-tests/k6-main.sh index ce76fe95bc..2112fdeee7 100755 --- a/k6-tests/k6-main.sh +++ b/k6-tests/k6-main.sh @@ -60,7 +60,7 @@ elif [[ "$deploymentType" == "k8sHosts" ]]; then # Wait for pods and services until becomes ready echo "Waiting for cps and ncmp pods to be ready..." - kubectl wait --for=condition=available deploy -l app=cps-and-ncmp --timeout=300s + kubectl wait --for=condition=available deploy -l app=ncmp --timeout=300s else echo "Error: Unsupported deployment type: $deploymentType" diff --git a/k6-tests/make-logs.sh b/k6-tests/make-logs.sh index 0707650478..05b4b3133b 100755 --- a/k6-tests/make-logs.sh +++ b/k6-tests/make-logs.sh @@ -26,7 +26,7 @@ readonly TIMESTAMP=$(date +"%Y%m%d%H%M%S") readonly DOCKER_SERVICES_TO_BE_LOGGED=("cps-and-ncmp" "ncmp-dmi-plugin-demo-and-csit-stub" "dbpostgresql") # Kubernetes services -readonly K8S_SERVICES_TO_BE_LOGGED=("cps-cps-and-ncmp-cps" "cps-cps-and-ncmp-dmi-stub" "cps-cps-and-ncmp-postgresql") +readonly K8S_SERVICES_TO_BE_LOGGED=("cps-ncmp" "cps-ncmp-dmi-stub" "cps-ncmp-postgresql") readonly K8S_APP_LABEL="app=cps-and-ncmp" # The default deployment type is dockerHosts diff --git a/k6-tests/ncmp/config/endurance.json b/k6-tests/ncmp/config/endurance.json index 4583e63520..e216ed065c 100644 --- a/k6-tests/ncmp/config/endurance.json +++ b/k6-tests/ncmp/config/endurance.json @@ -7,7 +7,7 @@ }, "k8sHosts": { "ncmpBaseUrl": "http://localhost:30080", - "dmiStubUrl": "http://cps-cps-and-ncmp-dmi-stub:8092", + "dmiStubUrl": "http://cps-ncmp-dmi-stub:8092", "kafkaBootstrapServer": "localhost:30093" }, "scenarios": { diff --git a/k6-tests/ncmp/config/kpi.json b/k6-tests/ncmp/config/kpi.json index 37dccf8fdc..666f70a355 100644 --- a/k6-tests/ncmp/config/kpi.json +++ b/k6-tests/ncmp/config/kpi.json @@ -7,7 +7,7 @@ }, "k8sHosts": { "ncmpBaseUrl": "http://localhost:30080", - "dmiStubUrl": "http://cps-cps-and-ncmp-dmi-stub:8092", + "dmiStubUrl": "http://cps-ncmp-dmi-stub:8092", "kafkaBootstrapServer": "localhost:30093" }, "scenarios": {