diff options
author | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2021-07-16 07:27:16 +0100 |
---|---|---|
committer | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2021-07-16 07:27:16 +0100 |
commit | 4334af1bd5ba0c49cf6c28d1b8ea08c5c76d0c39 (patch) | |
tree | 7d7917d898810f0d0e5b5210dd43add5d70f73e9 /participant | |
parent | 57fd0d340fbfb95ebd81b70d81eeb94f8965a029 (diff) |
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
Diffstat (limited to 'participant')
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 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 |