sync to the latest

Author: maggiehe00

documentation/4.0/content/samples/azure-kubernetes-service/includes/prerequisites-01.txt

@@ -2,6 +2,11 @@
 
 This sample assumes the following prerequisite environment.
 
+* If you don't have an [Azure subscription](https://learn.microsoft.com/en-us/azure/guides/developer/azure-developer-guide#understanding-accounts-subscriptions-and-billing), create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
+  * It's recommended that the Azure identity you use to sign in and complete this article has either the [Owner](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#owner) role in the current subscription or the [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) roles in the current subscription. 
+  * If your identity has very limited role assignments, ensure you have the following role assignments in the AKS resource group and AKS node resource group.
+    * [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) role and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) role in the resource group that runs AKS cluster. This requires asking a privileged user to assign the roles before creating resource in the resource group.
+    * [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) role in the AKS node resource group whose name starts with "MC_". This requires asking a privileged user to assign the role after the AKS instance is created.
 * Operating System: GNU/Linux, macOS or [WSL2 for Windows 10](https://docs.microsoft.com/windows/wsl/install-win10).
 * [Git](https://git-scm.com/downloads); use `git --version` to test if `git` works.  This document was tested with version 2.25.1.
 * [Azure CLI](https://docs.microsoft.com/cli/azure); use `az --version` to test if `az` works.  This document was tested with version 2.48.1.

documentation/4.0/content/samples/azure-kubernetes-service/includes/prerequisites-02.txt

@@ -2,9 +2,12 @@
 
 This sample assumes the following prerequisite environment.
 
+* If you don't have an [Azure subscription](https://learn.microsoft.com/en-us/azure/guides/developer/azure-developer-guide#understanding-accounts-subscriptions-and-billing), create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
+  * It's recommended that the Azure identity you use to sign in and complete this article has either the [Owner](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#owner) role in the current subscription or the [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) roles in the current subscription. 
+  * If your identity has very limited role assignments, ensure you have [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) role and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) role in the resource group that runs the AKS cluster. This requires asking a privileged user to assign the roles before creating resources in the resource group.
 * Operating System: GNU/Linux, macOS or [WSL2 for Windows 10](https://docs.microsoft.com/windows/wsl/install-win10).
 * [Git](https://git-scm.com/downloads); use `git --version` to test if `git` works.  This document was tested with version 2.25.1.
-* [Azure CLI](https://docs.microsoft.com/cli/azure); use `az --version` to test if `az` works.  This document was tested with version 2.39.0.
+* [Azure CLI](https://docs.microsoft.com/cli/azure); use `az --version` to test if `az` works.  This document was tested with version 2.48.1.
 * [Docker for Desktop](https://www.docker.com/products/docker-desktop).  This document was tested with `Docker version 20.10.7`
 * [kubectl](https://kubernetes-io-vnext-staging.netlify.com/docs/tasks/tools/install-kubectl/); use `kubectl version` to test if `kubectl` works.  This document was tested with version v1.21.2.
 * [Helm](https://helm.sh/docs/intro/install/), version 3.1 and later; use `helm version` to check the `helm` version.  This document was tested with version v3.6.2.

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPvUserCreateRcu.java

@@ -379,6 +379,7 @@ void testFmwDomainOnPvUserCreatesRCUMultiImages() {
 
   }
 
+
   /**
    * User creates RCU, Operate creates PV/PVC and FMW domain with additional WDT config map.
    * Verify Pod is ready and service exists for both admin server and managed servers.
@@ -492,7 +493,6 @@ private DomainCreationImage createImage(String fmwModelFile,  File fmwModelPropF
 
   }
 
-
   private File createWdtPropertyFile(String domainUid, String rcuSchemaPrefix) {
 
     Properties p = new Properties();

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/LoggingExporter.java

@@ -278,8 +278,6 @@ public static Map<String, String> verifyLoggingExporterReady(String opNamespace,
         execLoggingExpStatusCheck(opNamespace, esNamespace, labelSelector, "*" + index + "*");
     assertNotNull(statusLine);
 
-    logger.info("=== statusLine return by execLoggingExpStatusCheck: {0}!", statusLine);
-
     String [] parseString = statusLine.split("\\s+");
     assertTrue(parseString.length >= 3, index + " does not exist!");
     String healthStatus = parseString[0];
@@ -471,33 +469,28 @@ private static V1Service createKibanaServiceCr(LoggingExporterParams params) {
   private static String execLoggingExpStatusCheck(String opNamespace, String esNamespace,
       String labelSelector, String indexRegex) {
     String elasticSearchHost = "elasticsearch." + esNamespace + ".svc.cluster.local";
-    logger.info("=== elasticSearchHost in execLoggingExpStatusCheck: {0}", elasticSearchHost);
     StringBuffer k8sExecCmdPrefixBuff = new StringBuffer("curl http://");
     String cmd = k8sExecCmdPrefixBuff
         .append(elasticSearchHost)
         .append(":")
         .append(ELASTICSEARCH_HTTP_PORT)
         .append("/_cat/indices/")
         .append(indexRegex).toString();
-    logger.info("=== Command to get logging exporter status line {0}", cmd);
+    logger.info("Command to get logging exporter status line {0}", cmd);
 
     // get Operator pod name
     String operatorPodName = assertDoesNotThrow(() -> getOperatorPodName(OPERATOR_RELEASE_NAME, opNamespace));
     assertTrue(operatorPodName != null && !operatorPodName.isEmpty(), "Failed to get Operator pad name");
-    logger.info("=== operatorPodName in execLoggingExpStatusCheck: {0}", operatorPodName);
 
     int i = 0;
     ExecResult statusLine = null;
     while (i < maxIterationsPod) {
-      logger.info("=== cmd to exec execLoggingExpStatusCheck: opNamespace: {0}, operatorPodName: {1}, cmd {2} {3}",
+      logger.info("Command to exec execLoggingExpStatusCheck: opNamespace: {0}, operatorPodName: {1}, cmd {2} {3}",
           opNamespace, operatorPodName, "/bin/sh -c ", cmd);
       statusLine = assertDoesNotThrow(() -> execCommand(opNamespace, operatorPodName, null, true,
               "/bin/sh", "-c", cmd));
       assertNotNull(statusLine, "curl command returns null");
 
-      logger.info("Status.stdout(): ###{0}### for index ***{1}***", statusLine.stdout(), indexRegex);
-      logger.info("Status.stderr(): ###{0}###  for index ***{1}***", statusLine.stderr(), indexRegex);
-      logger.info("Status.toString(): ###{0}### for index ***{1}***", statusLine.toString(), indexRegex);
       if (null != statusLine.stdout() && !statusLine.stdout().isEmpty()) {
         break;
       }

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

@@ -385,8 +385,12 @@ private boolean shouldContinue(MakeRightDomainOperation operation, DomainPresenc
     final DomainPresenceInfo cachedInfo = getExistingDomainPresenceInfo(liveInfo);
     if (isNewDomain(cachedInfo)) {
       return true;
-    } else if (liveInfo.isFromOutOfDateEvent(operation, cachedInfo)
-        || liveInfo.isDomainProcessingHalted(cachedInfo)) {
+    } else if (liveInfo.isFromOutOfDateEvent(operation, cachedInfo)) {
+      return false;
+    } else if (isDeleting(operation)) {
+      return true;
+    } else if (liveInfo.isDomainProcessingHalted(cachedInfo)
+        || hasRetriableFailureNonRetryingOperation(operation, liveInfo)) {
       return false;
     } else if (operation.isExplicitRecheck() || liveInfo.isDomainGenerationChanged(cachedInfo)) {
       return true;
@@ -398,7 +402,7 @@ private boolean shouldContinue(MakeRightDomainOperation operation, DomainPresenc
 
   private boolean shouldContinue(MakeRightClusterOperation operation, ClusterPresenceInfo liveInfo) {
     final ClusterPresenceInfo cachedInfo = getExistingClusterPresenceInfo(liveInfo);
-    if (hasDeletedClusterEventData(operation)) {
+    if (isDeleting(operation)) {
       return findClusterPresenceInfo(liveInfo.getNamespace(), liveInfo.getResourceName());
     } else if (isNewCluster(cachedInfo)) {
       return true;
@@ -412,6 +416,10 @@ private boolean shouldContinue(MakeRightClusterOperation operation, ClusterPrese
     }
   }
 
+  private boolean hasRetriableFailureNonRetryingOperation(MakeRightDomainOperation operation, DomainPresenceInfo info) {
+    return info.hasRetriableFailure() && !operation.isRetryOnFailure();
+  }
+
   private boolean isNewDomain(DomainPresenceInfo cachedInfo) {
     return Optional.ofNullable(cachedInfo).map(DomainPresenceInfo::getDomain).orElse(null) == null;
   }
@@ -424,11 +432,15 @@ private boolean findClusterPresenceInfo(String namespace, String clusterName) {
     return Optional.ofNullable(clusters.get(namespace)).orElse(Collections.emptyMap()).get(clusterName) != null;
   }
 
-  private boolean hasDeletedClusterEventData(MakeRightClusterOperation operation) {
+  private boolean isDeleting(MakeRightClusterOperation operation) {
     return EventItem.CLUSTER_DELETED == getEventItem(operation);
   }
 
-  private EventItem getEventItem(MakeRightClusterOperation operation) {
+  private boolean isDeleting(MakeRightDomainOperation operation) {
+    return operation.isDeleting() || EventItem.DOMAIN_DELETED == getEventItem(operation);
+  }
+
+  private EventItem getEventItem(MakeRightOperation operation) {
     return Optional.ofNullable(operation.getEventData()).map(EventData::getItem).orElse(null);
   }
 
@@ -644,7 +656,7 @@ public void updateDomainStatus(@Nonnull V1PersistentVolumeClaim pvc, DomainPrese
   }
 
   private String getPhase(@Nonnull V1PersistentVolumeClaim pvc) {
-    return Optional.ofNullable(pvc).map(V1PersistentVolumeClaim::getStatus)
+    return Optional.of(pvc).map(V1PersistentVolumeClaim::getStatus)
         .map(V1PersistentVolumeClaimStatus::getPhase).orElse(null);
   }
 

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

@@ -272,8 +272,7 @@ private boolean isStranded(DomainPresenceInfo dpi) {
   private static void removeStrandedDomainPresenceInfo(DomainProcessor dp, DomainPresenceInfo info) {
     info.setDeleting(true);
     info.setPopulated(true);
-    dp.createMakeRightOperation(info).withExplicitRecheck().forDeletion().withEventData(new EventData(
-        EventItem.DOMAIN_DELETED)).execute();
+    dp.createMakeRightOperation(info).withExplicitRecheck().forDeletion().execute();
   }
 
   private Stream<DomainPresenceInfo> getActiveDomainPresenceInfos() {
@@ -289,9 +288,10 @@ private void activateDomain(DomainProcessor dp, DomainPresenceInfo info) {
     EventItem eventItem = getEventItem(info);
     MakeRightDomainOperation makeRight = dp.createMakeRightOperation(info).withExplicitRecheck();
     if (eventItem != null) {
-      makeRight.withEventData(new EventData(eventItem)).interrupt();
+      makeRight.withEventData(new EventData(eventItem)).interrupt().execute();
+    } else if (!info.hasRetriableFailure()) {
+      makeRight.execute();
     }
-    makeRight.execute();
   }
 
   private EventItem getEventItem(DomainPresenceInfo info) {

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

@@ -201,7 +201,7 @@ private boolean wasNotRolling() {
   /**
    * Creates an asynchronous step to initialize the domain status, if needed, to indicate that the operator has
    * seen the domain and is now working on it.
-   * @param hasEventData tue if the make right operation is associated with an event data
+   * @param hasEventData true if the make right operation is associated with an event.
    */
   public static Step createStatusInitializationStep(boolean hasEventData) {
     return new StatusInitializationStep(hasEventData);
@@ -603,7 +603,7 @@ void addDomainEvent(DomainCondition condition) {
   }
 
   public static class StatusInitializationStep extends DomainStatusUpdaterStep {
-    private boolean hasEventData;
+    private final boolean hasEventData;
 
     StatusInitializationStep(boolean hasEventData) {
       super();

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

@@ -10,6 +10,7 @@
  * Defines the operation to log a ClusterCreated/Changed/Deleted event.
  */
 public interface MakeRightClusterOperation extends MakeRightOperation<ClusterPresenceInfo> {
+
   /**
    * Set the event data that is associated with this operation.
    *
@@ -26,11 +27,4 @@ public interface MakeRightClusterOperation extends MakeRightOperation<ClusterPre
   MakeRightClusterOperation interrupt();
 
   MakeRightClusterOperation withExplicitRecheck();
-
-  /**
-   * Get the event data associated with this make-right operation.
-   *
-   * @return the event data.
-   */
-  EventHelper.EventData getEventData();
 }

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

@@ -44,8 +44,17 @@ public interface MakeRightDomainOperation extends MakeRightOperation<DomainPrese
    */
   MakeRightDomainOperation interrupt();
 
+  /**
+   * Modifies the factory to indicate that this is a retry operation on a retriable failure.
+   +
+   + @return the updated factory
+   */
+  MakeRightDomainOperation retryOnFailure();
+
   boolean isDeleting();
 
+  boolean isRetryOnFailure();
+
   void setInspectionRun();
 
   void setLiveInfo(@Nonnull DomainPresenceInfo info);
@@ -99,5 +108,4 @@ static Step createStepsToRerunWithIntrospection(Packet packet) {
   static Optional<MakeRightDomainOperation> fromPacket(Packet packet) {
     return Optional.ofNullable(packet.getValue(MAKE_RIGHT_DOMAIN_OPERATION));
   }
-
 }

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

@@ -5,6 +5,7 @@
 
 import javax.annotation.Nonnull;
 
+import oracle.kubernetes.operator.helpers.EventHelper;
 import oracle.kubernetes.operator.helpers.ResourcePresenceInfo;
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.PacketComponent;
@@ -15,6 +16,7 @@
  * or to log a ClusterCreated/Changed/Deleted event.
  */
 public interface MakeRightOperation<T extends ResourcePresenceInfo> extends PacketComponent {
+
   void execute();
 
   @Nonnull
@@ -28,5 +30,12 @@ public interface MakeRightOperation<T extends ResourcePresenceInfo> extends Pack
 
   boolean hasEventData();
 
+  /**
+   * Get the event data associated with this make-right operation.
+   *
+   * @return the event data.
+   */
+  EventHelper.EventData getEventData();
+
   boolean isExplicitRecheck();
 }