Merge "Add https support for k8s-participant endpoints"

2 files changed, 1 insertions, 26 deletions

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 b4f209d55..9d3523737 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
@@ -37,7 +37,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