Browse Source

ENTESB-11864 was affecting sb2 boosters as well: fixed.

release-work-7.0.0.fuse-sb2-760
Andrea Tarocchi 6 years ago
parent
commit
a1d2a8df6b
No known key found for this signature in database
GPG Key ID: EE5630CAB51A767C
  1. 4
      .openshiftio/application.yaml
  2. 4
      README.adoc
  3. 1
      src/main/resources/application.properties
  4. 2
      src/test/java/com/redhat/fuse/boosters/rest/http/HttpRequestTest.java

4
.openshiftio/application.yaml

@ -169,7 +169,7 @@ objects:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /actuator/health path: /health
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 180 initialDelaySeconds: 180
@ -186,7 +186,7 @@ objects:
protocol: TCP protocol: TCP
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /actuator/health path: /health
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 10 initialDelaySeconds: 10

4
README.adoc

@ -100,14 +100,14 @@ $ oc new-project MY_PROJECT_NAME
+ +
[source,bash,options="nowrap",subs="attributes+"] [source,bash,options="nowrap",subs="attributes+"]
---- ----
$ oc import-image fis-java-openshift:2.0 --from={image} --confirm $ oc import-image fuse-java-openshift:2.0 --from={image} --confirm
---- ----
. Build and deploy the project to the OpenShift cluster: . Build and deploy the project to the OpenShift cluster:
+ +
[source,bash,options="nowrap",subs="attributes+"] [source,bash,options="nowrap",subs="attributes+"]
---- ----
$ mvn clean -DskipTests fabric8:deploy -Popenshift -Dfabric8.generator.fromMode=istag -Dfabric8.generator.from=MY_PROJECT_NAME/fis-java-openshift:2.0 $ mvn clean -DskipTests fabric8:deploy -Popenshift -Dfabric8.generator.fromMode=istag -Dfabric8.generator.from=MY_PROJECT_NAME/fuse-java-openshift:2.0
---- ----
. In your browser, navigate to the `MY_PROJECT_NAME` project in the OpenShift console. . In your browser, navigate to the `MY_PROJECT_NAME` project in the OpenShift console.

1
src/main/resources/application.properties

@ -1,4 +1,5 @@
server.port=8080 server.port=8080
management.endpoints.web.base-path=/
# disable all management enpoints except health # disable all management enpoints except health
endpoints.enabled = false endpoints.enabled = false

2
src/test/java/com/redhat/fuse/boosters/rest/http/HttpRequestTest.java

@ -26,6 +26,6 @@ public class HttpRequestTest {
@Test @Test
public void healthShouldReturnOkMessage() throws Exception { public void healthShouldReturnOkMessage() throws Exception {
Assert.assertEquals( "{\"status\":\"UP\"}", this.restTemplate.getForObject("http://localhost:" + port + "/actuator/health", String.class)); Assert.assertEquals( "{\"status\":\"UP\"}", this.restTemplate.getForObject("http://localhost:" + port + "/health", String.class));
} }
} }

Loading…
Cancel
Save