Consistently manage domain resources using name rather than domainUid (…

…#3741)
oracle · Dec 10, 2022 · 9fa9d85 · 9fa9d85
1 parent ac94ef1
commit 9fa9d85
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/operator/src/main/java/oracle/kubernetes/operator/WaitForReadyStep.java b/operator/src/main/java/oracle/kubernetes/operator/WaitForReadyStep.java
@@ -34,7 +34,7 @@ abstract class WaitForReadyStep<T> extends Step {
 
   protected static Step createMakeDomainRightStep(WaitForReadyStep<?>.Callback callback,
                                            DomainPresenceInfo info, Step next) {
-    return new CallBuilder().readDomainAsync(info.getDomainUid(),
+    return new CallBuilder().readDomainAsync(info.getDomainName(),
             info.getNamespace(), new MakeRightDomainStep<>(callback, null));
   }
 

diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java
@@ -800,7 +800,7 @@ public Object createClusterUntyped(String namespace, Map<String, Object> body) t
   /**
    * Patch cluster.
    *
-   * @param name the domain uid (unique within the k8s cluster)
+   * @param name the domain name
    * @param namespace the namespace containing the domain
    * @param patchBody the patch to apply
    * @return Updated cluster
@@ -921,41 +921,41 @@ public Step readDomainAsync(String name, String namespace, ResponseStep<DomainRe
   /**
    * Read domain synchronously.
    *
-   * @param uid the domain uid (unique within the k8s cluster)
+   * @param name the domain name
    * @param namespace Namespace
    * @return Replaced domain
    * @throws ApiException APIException
    */
-  public DomainResource readDomain(String uid, String namespace) throws ApiException {
-    RequestParams requestParams = new RequestParams("readDomain", namespace, uid, null, (String)null);
+  public DomainResource readDomain(String name, String namespace) throws ApiException {
+    RequestParams requestParams = new RequestParams("readDomain", namespace, name, null, (String)null);
     return executeSynchronousCall(requestParams, readDomainCall);
   }
 
   /**
    * Replace domain.
    *
-   * @param uid the domain uid (unique within the k8s cluster)
+   * @param name the domain name
    * @param namespace Namespace
    * @param body Body
    * @return Replaced domain
    * @throws ApiException APIException
    */
-  public DomainResource replaceDomain(String uid, String namespace, DomainResource body) throws ApiException {
-    RequestParams requestParams = new RequestParams("replaceDomain", namespace, uid, body, uid);
+  public DomainResource replaceDomain(String name, String namespace, DomainResource body) throws ApiException {
+    RequestParams requestParams = new RequestParams("replaceDomain", namespace, name, body, name);
     return executeSynchronousCall(requestParams, replaceDomainCall);
   }
 
   /**
    * Replace domain status.
    *
-   * @param uid the domain uid (unique within the k8s cluster)
+   * @param name the domain name
    * @param namespace Namespace
    * @param body Body
    * @return Replaced domain
    * @throws ApiException APIException
    */
-  public DomainResource replaceDomainStatus(String uid, String namespace, DomainResource body) throws ApiException {
-    RequestParams requestParams = new RequestParams("replaceDomainStatus", namespace, uid, body, uid);
+  public DomainResource replaceDomainStatus(String name, String namespace, DomainResource body) throws ApiException {
+    RequestParams requestParams = new RequestParams("replaceDomainStatus", namespace, name, body, name);
     return executeSynchronousCall(requestParams, replaceDomainStatusCall);
   }
 
@@ -984,15 +984,15 @@ public Step replaceDomainAsync(
   /**
    * Patch domain.
    *
-   * @param uid the domain uid (unique within the k8s cluster)
+   * @param name the domain name
    * @param namespace the namespace containing the domain
    * @param patchBody the patch to apply
    * @return Updated domain
    * @throws ApiException APIException
    */
-  public DomainResource patchDomain(String uid, String namespace, V1Patch patchBody) throws ApiException {
+  public DomainResource patchDomain(String name, String namespace, V1Patch patchBody) throws ApiException {
     RequestParams requestParams =
-        new RequestParams("patchDomain", namespace, uid, patchBody, uid);
+        new RequestParams("patchDomain", namespace, name, patchBody, name);
     return executeSynchronousCall(requestParams, patchDomainCall);
   }
 

diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java
@@ -741,6 +741,15 @@ public String getDomainUid() {
     return domainUid;
   }
 
+  /**
+   * Gets the Domain name.
+   *
+   * @return Domain name
+   */
+  public String getDomainName() {
+    return getDomain().getMetadata().getName();
+  }
+
   @Override
   public String getResourceName() {
     return getDomainUid();

diff --git a/operator/src/main/java/oracle/kubernetes/operator/http/rest/RestBackendImpl.java b/operator/src/main/java/oracle/kubernetes/operator/http/rest/RestBackendImpl.java
@@ -457,7 +457,7 @@ private void patchDomain(DomainResource domain, JsonPatchBuilder patchBuilder) {
     try {
       callBuilder
           .patchDomain(
-              domain.getDomainUid(), domain.getMetadata().getNamespace(),
+              domain.getMetadata().getName(), domain.getMetadata().getNamespace(),
               new V1Patch(patchBuilder.build().toString()));
     } catch (ApiException e) {
       throw handleApiException(e);

diff --git a/...ator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightDomainOperationImpl.java b/...ator/src/main/java/oracle/kubernetes/operator/makeright/MakeRightDomainOperationImpl.java
@@ -348,7 +348,7 @@ private class UpHeadStep extends Step {
     @Override
     public NextAction apply(Packet packet) {
       DomainPresenceInfo info = packet.getSpi(DomainPresenceInfo.class);
-      return doNext(new CallBuilder().readDomainAsync(info.getDomainUid(), info.getNamespace(),
+      return doNext(new CallBuilder().readDomainAsync(info.getDomainName(), info.getNamespace(),
           new ReadDomainResponseStep(getNext())), packet);
     }
   }

diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainResource.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainResource.java
@@ -611,7 +611,8 @@ public static boolean isAdminChannelPortForwardingEnabled(DomainSpec domainSpec)
    * @return domain home
    */
   public String getDomainHome() {
-    return emptyToNull(spec.getDomainHome());
+    return emptyToNull(Optional.ofNullable(spec.getDomainHome())
+            .orElse(getDomainHomeSourceType().getDefaultDomainHome(getDomainUid())));
   }
 
   /**

diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java
@@ -518,7 +518,7 @@ public DomainSpec withDomainUid(String domainUid) {
    * @return domain home
    */
   String getDomainHome() {
-    return Optional.ofNullable(domainHome).orElse(getDomainHomeSourceType().getDefaultDomainHome(getDomainUid()));
+    return domainHome;
   }
 
   public String getLivenessProbeCustomScript() {