Skip to content

Commit

Permalink
chore: Housekeeping
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Nuri <marc@marcnuri.com>
  • Loading branch information
manusa committed Feb 22, 2021
1 parent 187169a commit 0e5b98b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Usage:
```
### 1.1.1-SNAPSHOT
* Fix #570: Disable namespace creation during k8s:resource with `jkube.namespace` flag
* Fix #579: Fixed quarkus health paths

### 1.1.0 (2021-01-28)
* Fix #579: Fixed quarkus health paths
* Fix #455: Use OpenShiftServer with JUnit rule instead of directly instantiating the OpenShiftMockServer
* Fix #467: Upgrade assertj-core to 3.18.0
* Fix #460: Added a Quickstart for implementing and using a Custom Enricher based on Eclipse JKube Kit Enricher API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@

import io.fabric8.kubernetes.api.model.Probe;
import io.fabric8.kubernetes.api.model.ProbeBuilder;
import java.nio.file.Paths;

import lombok.AllArgsConstructor;
import lombok.Getter;
import org.eclipse.jkube.kit.common.Configs;
import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
import org.eclipse.jkube.kit.enricher.specific.AbstractHealthCheckEnricher;

import static org.eclipse.jkube.kit.common.Configs.asInteger;
import static org.eclipse.jkube.kit.common.util.FileUtil.stripPrefix;


/**
Expand Down Expand Up @@ -70,11 +71,10 @@ private Probe discoverQuarkusHealthCheck(int initialDelay, String subPath) {
if (!getContext().hasDependency("io.quarkus", "quarkus-smallrye-health")) {
return null;
}

return new ProbeBuilder()
.withNewHttpGet()
.withNewPort(asInteger(getConfig(Config.PORT)))
.withPath(Paths.get("/", getConfig(Config.HEALTH_PATH), subPath).toString())
.withPath(String.format("/%s/%s", stripPrefix(getConfig(Config.HEALTH_PATH), "/"), subPath))
.withScheme(getConfig(Config.SCHEME))
.endHttpGet()
.withFailureThreshold(asInteger(getConfig(Config.FAILURE_THRESHOLD)))
Expand Down

0 comments on commit 0e5b98b

Please sign in to comment.