Fix exposed ports for participants

Most participants expose different ports, while only
port 6969 is used for server.port in application.yaml

- Expose port 6969 in Dockerfiles.
- Remove unused CDS participant module.

Issue-ID: POLICY-5534
Change-Id: Ic2a8e6b4ff089e7223a3049215a9b79b6d46c76d
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>

diff --git a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile
index 4d03d9b..7ed23f5 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/A1pmsParticipant.Dockerfile
@@ -49,7 +49,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy /maven/policy-clamp-participant-impl-a1pms.jar /app/app.jar
 
-EXPOSE 8086
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
index 00ce1f3..601843a 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/HttpParticipant.Dockerfile
@@ -49,7 +49,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy /maven/policy-clamp-participant-impl-http.jar /app/app.jar
 
-EXPOSE 8084
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile
index 0632c4e..93bd420 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KserveParticipant.Dockerfile
@@ -49,7 +49,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy /maven/policy-clamp-participant-impl-kserve.jar /app/app.jar
 
-EXPOSE 8087
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
index be45208..e7c75a6 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipant.Dockerfile
@@ -61,7 +61,7 @@ RUN chmod 755 bin/*.sh && \
     chmod +x kubectl && \
     mv kubectl /usr/local/bin/kubectl
 
-EXPOSE 8083
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
index 434b447..bd06388 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/PolicyParticipant.Dockerfile
@@ -49,7 +49,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy /maven/policy-clamp-participant-impl-policy.jar /app/app.jar
 
-EXPOSE 8085
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile
index 050779f..c0941b8 100644 (file)
--- a/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/SimParticipant.Dockerfile
@@ -49,7 +49,7 @@ COPY --chown=policy:policy --from=tarball /extracted $POLICY_HOME
 WORKDIR $POLICY_HOME
 COPY --chown=policy:policy /maven/policy-clamp-participant-impl-sim.jar /app/app.jar
 
-EXPOSE 8084
+EXPOSE 6969
 
 USER policy
 WORKDIR $POLICY_HOME

diff --git a/participant/participant-impl/participant-impl-cds/pom.xml b/participant/participant-impl/participant-impl-cds/pom.xml
deleted file mode 100644 (file)
index b186ad4..0000000
--- a/participant/participant-impl/participant-impl-cds/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  Copyright (C) 2021, 2025 OpenInfra Foundation Europe. All rights reserved.
-  ================================================================================
-  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=========================================================
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.policy.clamp.participant</groupId>
-        <artifactId>policy-clamp-participant-impl</artifactId>
-        <version>9.0.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>policy-clamp-participant-impl-cds</artifactId>
-    <name>${project.artifactId}</name>
-    <description>CDS participant, that allows CDS to partake in automation compositions</description>
-</project>

diff --git a/participant/participant-impl/pom.xml b/participant/participant-impl/pom.xml
index 6dee38a..ce234b9 100644 (file)
--- a/participant/participant-impl/pom.xml
+++ b/participant/participant-impl/pom.xml
@@ -38,7 +38,6 @@
         <module>participant-impl-simulator</module>
         <module>participant-impl-acelement</module>
         <module>participant-impl-policy</module>
-        <module>participant-impl-cds</module>
         <module>participant-impl-kubernetes</module>
         <module>participant-impl-http</module>
         <module>participant-impl-a1pms</module>

diff --git a/pom.xml b/pom.xml
index 63e47e0..0f66c4b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
         - policy-clamp-runtime-acm: The runtime server for Automation Composition Management
         - policy-clamp-participant: Modules for CLAMP automation composition participants
         o policy-clamp-participant-intermediary: A common JAR that handles participant state and Kafka handling
-        o policy-clamp-participant-impl-cds: A standard participant for interworking with CDS
         o policy-clamp-participant-impl-kubernetes: A standard participant for Kubernetes microservices
         o policy-clamp-participant-impl-policy: A standard participant for handling polcies for Policy Framework
         o policy-clamp-acm-element-impl: ACM element implementation for integration testing