Merge branch 'main' of https://github.com/oracle/weblogic-kubernetes-operator

Author: rjeberhard

common/src/main/java/oracle/kubernetes/common/utils/SchemaConversionUtils.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.common.utils;
@@ -430,7 +430,7 @@ private void convertDomainHomeInImageToDomainHomeSourceType(Map<String, Object>
       Object existing = domainSpec.remove("domainHomeInImage");
       if (existing != null && !domainSpec.containsKey("domainHomeSourceType")) {
         domainSpec.put("domainHomeSourceType",
-                Boolean.parseBoolean((String) existing) ? "Image" : "PersistentVolume");
+                Boolean.TRUE.equals(existing) ? "Image" : "PersistentVolume");
       }
     }
   }

common/src/test/java/oracle/kubernetes/common/utils/SchemaConversionUtilsTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.common.utils;
@@ -297,7 +297,7 @@ private Map<String, Object> getDomainSpec(Map<String, Object> domainMap) {
   }
 
   private void setDomainHomeInImage(Map<String, Object> v8Domain, boolean domainHomeInImage) {
-    getDomainSpec(v8Domain).put("domainHomeInImage", String.valueOf(domainHomeInImage));
+    getDomainSpec(v8Domain).put("domainHomeInImage", domainHomeInImage);
   }
 
   private void setDomainHomeSourceType(Map<String, Object> v8Domain, String domainHomeSourceType) {

integration-tests/pom.xml

@@ -352,6 +352,11 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
+            <configuration>
+                <excludes>
+                    <exclude>com/gargoylesoftware/**</exclude>
+                </excludes>
+            </configuration>
           </plugin>
         </plugins>
     </build>

okdtest.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022, Oracle and/or its affiliates.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 set -o errexit
@@ -135,6 +135,8 @@ ${KUBERNETES_CLI} delete pv pv-testalertmanagertest3 --wait=false || true
 ${KUBERNETES_CLI} delete pv pv-testgrafanatest3 --wait=false || true
 ${KUBERNETES_CLI} delete pv pv-testprometheustest3 --wait=false || true
 
+${KUBERNETES_CLI} delete crd $(${KUBERNETES_CLI} get crd | grep weblogic) || true
+
 ${KUBERNETES_CLI} get ingressroutes -A --no-headers | awk '/tdlbs-/{print $2}' | xargs ${KUBERNETES_CLI} delete ingressroute || true
 ${KUBERNETES_CLI} get clusterroles --no-headers | awk '/ns-/{print $1}' | xargs ${KUBERNETES_CLI} delete clusterroles || true
 ${KUBERNETES_CLI} get clusterroles --no-headers | awk '/appscode/{print $1}' | xargs ${KUBERNETES_CLI} delete clusterroles || true

operator/pom.xml

@@ -287,6 +287,11 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+            <excludes>
+                <exclude>com/gargoylesoftware/**</exclude>
+            </excludes>
+        </configuration>
       </plugin>
     </plugins>
   </build>

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -22,6 +22,14 @@ public interface CoreDelegate extends PacketComponent {
 
   KubernetesVersion getKubernetesVersion();
 
+  String getDomainCrdResourceVersion();
+
+  void setDomainCrdResourceVersion(String resourceVersion);
+
+  String getClusterCrdResourceVersion();
+
+  void setClusterCrdResourceVersion(String resourceVersion);
+
   File getDeploymentHome();
 
   File getProbesHome();

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
@@ -35,6 +35,8 @@ public class CoreDelegateImpl implements CoreDelegate {
   protected final Engine engine;
   protected final String deploymentImpl;
   protected final String deploymentBuildTime;
+  protected String domainCrdResourceVersion;
+  protected String clusterCrdResourceVersion;
 
   CoreDelegateImpl(Properties buildProps, ScheduledExecutorService scheduledExecutorService) {
     buildVersion = getBuildVersion(buildProps);
@@ -80,6 +82,26 @@ public KubernetesVersion getKubernetesVersion() {
     return kubernetesVersion;
   }
 
+  @Override
+  public String getDomainCrdResourceVersion() {
+    return domainCrdResourceVersion;
+  }
+
+  @Override
+  public void setDomainCrdResourceVersion(String resourceVersion) {
+    this.domainCrdResourceVersion = resourceVersion;
+  }
+
+  @Override
+  public String getClusterCrdResourceVersion() {
+    return clusterCrdResourceVersion;
+  }
+
+  @Override
+  public void setClusterCrdResourceVersion(String resourceVersion) {
+    this.clusterCrdResourceVersion = resourceVersion;
+  }
+
   @Override
   public File getDeploymentHome() {
     return deploymentHome;

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

@@ -1,14 +1,16 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator;
 
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.kubernetes.client.common.KubernetesListObject;
+import io.kubernetes.client.openapi.ApiException;
 import oracle.kubernetes.common.logging.MessageKeys;
 import oracle.kubernetes.operator.calls.CallResponse;
 import oracle.kubernetes.operator.helpers.CallBuilder;
@@ -29,6 +31,8 @@
 import static oracle.kubernetes.common.CommonConstants.SECRETS_WEBHOOK_CERT;
 import static oracle.kubernetes.common.CommonConstants.SECRETS_WEBHOOK_KEY;
 import static oracle.kubernetes.operator.EventConstants.OPERATOR_WEBHOOK_COMPONENT;
+import static oracle.kubernetes.operator.KubernetesConstants.CLUSTER_CRD_NAME;
+import static oracle.kubernetes.operator.KubernetesConstants.DOMAIN_CRD_NAME;
 import static oracle.kubernetes.operator.helpers.CrdHelper.createClusterCrdStep;
 import static oracle.kubernetes.operator.helpers.CrdHelper.createDomainCrdStep;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.WEBHOOK_STARTUP_FAILED;
@@ -47,7 +51,6 @@ public class WebhookMain extends BaseMain {
   private static NextStepFactory nextStepFactory = WebhookMain::createInitializeWebhookIdentityStep;
 
   static class WebhookMainDelegateImpl extends CoreDelegateImpl implements WebhookMainDelegate {
-
     public WebhookMainDelegateImpl(Properties buildProps, ScheduledExecutorService scheduledExecutorService) {
       super(buildProps, scheduledExecutorService);
     }
@@ -67,7 +70,6 @@ public String getWebhookCertUri() {
     public String getWebhookKeyUri() {
       return SECRETS_WEBHOOK_KEY;
     }
-
   }
 
   /**
@@ -153,13 +155,42 @@ Runnable recheckCrd() {
   }
 
   Step createCRDRecheckSteps() {
+    Step optimizedRecheckSteps = Step.chain(createDomainCRDPresenceCheck(), createClusterCRDPresenceCheck());
+    try {
+      String clusterCrdResourceVersion = getCrdResourceVersion(CLUSTER_CRD_NAME);
+      String domainCrdResourceVersion = getCrdResourceVersion(DOMAIN_CRD_NAME);
+      if (crdMissingOrChanged(clusterCrdResourceVersion, delegate.getClusterCrdResourceVersion())) {
+        optimizedRecheckSteps = Step.chain(createClusterCrdStep(delegate.getProductVersion()), optimizedRecheckSteps);
+      }
+      if (crdMissingOrChanged(domainCrdResourceVersion, delegate.getDomainCrdResourceVersion())) {
+        optimizedRecheckSteps = Step.chain(createDomainCrdStep(delegate.getProductVersion(),
+            new Certificates(delegate)), optimizedRecheckSteps);
+      }
+      delegate.setDomainCrdResourceVersion(domainCrdResourceVersion);
+      delegate.setClusterCrdResourceVersion(clusterCrdResourceVersion);
+      return optimizedRecheckSteps;
+    } catch (Exception e) {
+      return createFullCRDRecheckSteps();
+    }
+  }
+
+  private String getCrdResourceVersion(String crdName) throws ApiException {
+    return Optional.ofNullable(new CallBuilder().readCRDMetadata(crdName))
+        .map(pom -> pom.getMetadata()).map(m -> m.getResourceVersion()).orElse(null);
+  }
+
+  private Step createFullCRDRecheckSteps() {
     return Step.chain(
         createDomainCrdStep(delegate.getProductVersion(), new Certificates(delegate)),
         createClusterCrdStep(delegate.getProductVersion()),
         createDomainCRDPresenceCheck(),
         createClusterCRDPresenceCheck());
   }
 
+  private boolean crdMissingOrChanged(String crdResourceVersion, String cachedCrdResourceVersion) {
+    return crdResourceVersion == null || !crdResourceVersion.equals(cachedCrdResourceVersion);
+  }
+
   // Returns a step that verifies the presence of an installed domain CRD. It does this by attempting to list the
   // domains in the operator's namespace. That should succeed (although usually returning an empty list)
   // if the CRD is present.

operator/src/main/java/oracle/kubernetes/operator/calls/RequestParams.java

@@ -1,8 +1,9 @@
-// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.calls;
 
+import java.util.Arrays;
 import javax.annotation.Nonnull;
 
 import io.kubernetes.client.openapi.ApiException;
@@ -13,6 +14,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 public final class RequestParams {
+  public static final String[] SUB_RESOURCE_SUFFIXES = {"Status", "Metadata"};
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
   public final String call;
@@ -124,6 +126,15 @@ private int indexOfFirstCapitalInCallName() {
 
   @Nonnull
   public String getOperationName() {
-    return call.substring(0, indexOfFirstCapitalInCallName()) + (call.endsWith("Status") ? "Status" : "");
+    return call.substring(0, indexOfFirstCapitalInCallName()) + getCallSuffix();
+  }
+
+  @Nonnull
+  private String getCallSuffix() {
+    return Arrays.stream(SUB_RESOURCE_SUFFIXES).filter(this::isCallSuffix).findFirst().orElse("");
+  }
+
+  private boolean isCallSuffix(String suffix) {
+    return call.endsWith(suffix);
   }
 }

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.kubernetes.operator.helpers;
@@ -71,10 +71,12 @@
 import oracle.kubernetes.operator.tuning.TuningParameters;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.api.WeblogicApi;
+import oracle.kubernetes.weblogic.domain.api.WeblogicGenericApi;
 import oracle.kubernetes.weblogic.domain.model.ClusterList;
 import oracle.kubernetes.weblogic.domain.model.ClusterResource;
 import oracle.kubernetes.weblogic.domain.model.DomainList;
 import oracle.kubernetes.weblogic.domain.model.DomainResource;
+import oracle.kubernetes.weblogic.domain.model.PartialObjectMetadata;
 
 import static oracle.kubernetes.operator.helpers.KubernetesUtils.getDomainUidLabel;
 import static oracle.kubernetes.utils.OperatorUtils.isNullOrEmpty;
@@ -479,6 +481,11 @@ public <T> T execute(
                   RESOURCE_VERSION,
                   timeoutSeconds,
                   WATCH);
+
+  private final SynchronousCallFactory<PartialObjectMetadata> readCRDMetadataCall =
+      (client, requestParams) ->
+          new WeblogicGenericApi(client).readCustomResourceDefinitionMetadata(requestParams.name);
+
   private final SynchronousCallFactory<DomainResource> readDomainCall =
       (client, requestParams) ->
           new WeblogicApi(client)
@@ -869,6 +876,18 @@ public Object replaceClusterUntyped(String name, String namespace, Map<String, O
     return executeSynchronousCall(requestParams, listDomainCall);
   }
 
+  /**
+   * Get crd metadata.
+   *
+   * @return crd metadata
+   * @throws ApiException API exception
+   */
+  public @Nonnull PartialObjectMetadata readCRDMetadata(String name) throws ApiException {
+    RequestParams requestParams = new RequestParams("readCRDMetadata", null,
+        name, null, callParams);
+    return executeSynchronousCall(requestParams, readCRDMetadataCall);
+  }
+
   private Call listDomainAsync(
       ApiClient client, String namespace, String cont, ApiCallback<DomainList> callback)
       throws ApiException {