Skip to content

Commit b855d6e

Browse files
authored
Merge pull request #382 from oracle/podhelper-refinement
Podhelper refinement
2 parents 8cf9221 + ab9a229 commit b855d6e

File tree

13 files changed

+2314
-1455
lines changed

13 files changed

+2314
-1455
lines changed

operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.util.TreeMap;
1616
import java.util.concurrent.ConcurrentMap;
1717
import oracle.kubernetes.operator.helpers.CallBuilder;
18-
import oracle.kubernetes.operator.helpers.CallBuilderFactory;
1918
import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
2019
import oracle.kubernetes.operator.helpers.DomainPresenceInfo.ServerStartupInfo;
2120
import oracle.kubernetes.operator.helpers.ResponseStep;
@@ -26,7 +25,6 @@
2625
import oracle.kubernetes.operator.wlsconfig.WlsClusterConfig;
2726
import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
2827
import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
29-
import oracle.kubernetes.operator.work.ContainerResolver;
3028
import oracle.kubernetes.operator.work.Fiber;
3129
import oracle.kubernetes.operator.work.Fiber.CompletionCallback;
3230
import oracle.kubernetes.operator.work.NextAction;
@@ -639,11 +637,8 @@ private static NextAction doDomainUpdate(
639637
Domain dom, DomainPresenceInfo info, Packet packet, Step conflictStep, Step next) {
640638
V1ObjectMeta meta = dom.getMetadata();
641639
NextAction na = new NextAction();
642-
CallBuilderFactory factory =
643-
ContainerResolver.getInstance().getContainer().getSPI(CallBuilderFactory.class);
644640
na.invoke(
645-
factory
646-
.create()
641+
new CallBuilder()
647642
.replaceDomainAsync(
648643
meta.getName(),
649644
meta.getNamespace(),
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at
3+
// http://oss.oracle.com/licenses/upl.
4+
5+
package oracle.kubernetes.operator;
6+
7+
import io.kubernetes.client.models.V1Pod;
8+
import oracle.kubernetes.operator.work.Step;
9+
10+
public interface PodAwaiterStepFactory {
11+
/**
12+
* Waits until the Pod is Ready
13+
*
14+
* @param pod Pod to watch
15+
* @param next Next processing step once Pod is ready
16+
* @return Asynchronous step
17+
*/
18+
Step waitForReady(V1Pod pod, Step next);
19+
}

0 commit comments

Comments
 (0)