From 4334af1bd5ba0c49cf6c28d1b8ea08c5c76d0c39 Mon Sep 17 00:00:00 2001
From: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Date: Fri, 16 Jul 2021 07:27:16 +0100
Subject: Add https support for k8s-participant endpoints

Removed additional http port connector configuration
Enabling ssl in Dockerfile

Issue-ID: POLICY-3334
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: I229052f557b95b9aa565dbcf54c3dde30514b6ad
---
 .../main/docker/KubernetesParticipantDockerfile    |  2 +-
 .../src/main/docker/kubernetes-participant.sh      |  8 +++----
 .../configurations/ParticipantConfig.java          | 25 ----------------------
 .../src/main/resources/config/application.yaml     |  2 +-
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
index 40532c002..63209d75f 100644
--- a/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
+++ b/packages/policy-clamp-docker/src/main/docker/KubernetesParticipantDockerfile
@@ -57,7 +57,7 @@ RUN chown -R policy:policy * && \
     chmod +x kubectl && \
     mv kubectl /usr/local/bin/kubectl
 
-EXPOSE 8080
+EXPOSE 8083
 
 USER policy
 WORKDIR $POLICY_HOME/bin
diff --git a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
index 195639ad3..50995de3b 100644
--- a/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
+++ b/packages/policy-clamp-docker/src/main/docker/kubernetes-participant.sh
@@ -42,8 +42,8 @@ if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/logback*.xml "${POLICY_HOME}"/etc/
 fi
 
-$JAVA_HOME/bin/java -Djavax.net.ssl.keyStore="${KEYSTORE}" \
-    -Djavax.net.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
-    -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \
-    -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
+$JAVA_HOME/bin/java -Dserver.ssl.keyStore="${KEYSTORE}" \
+    -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \
+    -Dserver.ssl.trustStore="${TRUSTSTORE}" \
+    -Dserver.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \
     -jar /app/app.jar
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/configurations/ParticipantConfig.java b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/configurations/ParticipantConfig.java
index 94789a74f..97adfde88 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/configurations/ParticipantConfig.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/java/org/onap/policy/clamp/controlloop/participant/kubernetes/configurations/ParticipantConfig.java
@@ -33,30 +33,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 @Configuration
 public class ParticipantConfig {
 
-    @Value("${server.http-port}")
-    private int httpPort = 0;
-
-    /**
-     * Method to create servlet container bean.
-     * @return webserver factory
-     */
-    @Bean
-    public ServletWebServerFactory servletContainer() {
-        var tomcat = new TomcatServletWebServerFactory();
-        if (httpPort > 0) {
-            tomcat.addAdditionalTomcatConnectors(getHttpConnector(httpPort));
-        }
-        return tomcat;
-    }
-
-    private static Connector getHttpConnector(int httpPort) {
-        var connector = new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL);
-        connector.setScheme("http");
-        connector.setPort(httpPort);
-        connector.setSecure(false);
-        return connector;
-    }
-
     /**
      * Method to create multipartResolver bean.
      * @return MultipartResolver
@@ -67,5 +43,4 @@ public class ParticipantConfig {
         multipartResolver.setMaxUploadSize(100000);
         return multipartResolver;
     }
-
 }
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
index 5a2903c56..e5f4e3950 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
+++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml
@@ -41,7 +41,7 @@ management:
 server:
   # Configuration of the HTTP/REST server. The parameters are defined and handled by the springboot framework.
   # See springboot documentation.
-  http-port : 8083
+  port: 8083
 
 logging:
   # Configuration of logging
-- 
cgit 1.2.3-korg