Skip to content

Commit c8fb2e1

Browse files
committed
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into fix-curl-hostname
2 parents 51f4a59 + b631d6a commit c8fb2e1

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

docs/charts/index.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: v1
22
entries:
33
weblogic-operator:
4-
- created: 2019-02-06T10:58:20.175515059-08:00
5-
description: Helm package for creation of the Weblogic operator.
6-
digest: de086ca50a523ec94afc216b0b45ca7d431c6c9c454ea5d26c1ccd76220a5e7f
4+
- created: 2019-02-14T14:24:39.055209-05:00
5+
description: Helm chart for configuring the WebLogic operator.
6+
digest: b3d5d765758da69dc6020dd47e84d532ba9464630c010aafbbf97e9c38495aec
77
name: weblogic-operator
88
urls:
99
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
1010
version: "2.1"
11-
generated: 2019-02-06T10:58:20.173792276-08:00
11+
generated: 2019-02-14T14:24:39.053451-05:00

docs/charts/weblogic-operator-2.1.tgz

294 Bytes
Binary file not shown.

kubernetes/package-helm-charts.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ fi
3131
if [ $srctime \> $dsttime ];
3232
then
3333
mkdir $SCRIPTPATH/../docs/charts
34-
helm repo index $WOCHARTPATH/ --url https://oracle.github.io/weblogic-kubernetes-operator/charts --merge $SCRIPTPATH/../docs/charts/index.yaml
35-
3634
mv -f $helm_package $SCRIPTPATH/../docs/charts/
37-
rm $WOCHARTPATH/index.yaml
35+
helm repo index $SCRIPTPATH/../docs/charts/ --url https://oracle.github.io/weblogic-kubernetes-operator/charts
3836
else
3937
rm $helm_package
4038
fi;

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public abstract class PodStepContext extends StepContextBase {
6969
private static final String START_SERVER = "/weblogic-operator/scripts/startServer.sh";
7070
private static final String LIVENESS_PROBE = "/weblogic-operator/scripts/livenessProbe.sh";
7171

72-
private static final String READINESS_PATH = "/weblogic";
72+
private static final String READINESS_PATH = "/weblogic/";
7373

7474
private final DomainPresenceInfo info;
7575
private final WlsDomainConfig domainTopology;

operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public void whenPodCreated_livenessProbeHasDefinedTuning() {
278278
@Test
279279
public void whenPodCreated_readinessProbeHasReadinessCommand() {
280280
V1HTTPGetAction getAction = getCreatedPodSpecContainer().getReadinessProbe().getHttpGet();
281-
assertThat(getAction.getPath(), equalTo("/weblogic"));
281+
assertThat(getAction.getPath(), equalTo("/weblogic/"));
282282
assertThat(getAction.getPort().getIntValue(), equalTo(listenPort));
283283
}
284284

0 commit comments

Comments
 (0)