Merge branch 'events' into 'main'

Use most current types for Kubernetes Events

See merge request weblogic-cloud/weblogic-kubernetes-operator!5032

Author: rjeberhard

documentation/site/content/managing-domains/accessing-the-domain/domain-events.md

@@ -88,14 +88,14 @@ Each operator-generated event contains the following fields:
     *  `namespace`:  Namespace in which the event is generated.
     *  `labels`:   `weblogic.createdByOperator=true` and, for a domain event, `weblogic.domainUID=<domainUID>`.
  *  `type`:  String that describes the type of the event. Possible values are `Normal` or `Warning`.
- *  `count`: Integer that indicates the number of occurrences of the event. Note that the events are matched by the combination of the `reason`, `involvedObject`, and `message` fields.
+ *  `count`: Integer that indicates the number of occurrences of the event. Note that the events are matched by the combination of the `reason`, `regarding`, and `message` fields.
  *  `reportingComponent`:  String that describes the component that reports the event. The value is `weblogic.operator` for all operator-generated events.
  *  `reportingInstance`:  String that describes the instance that reports the event. The value is the Kubernetes pod name of the operator instance that generates the event.
  *  `firstTimestamp`:  `DateTime` field that presents the timestamp of the first occurrence of this event.
  *  `lastTimestamp`:  `DateTime` field that presents the timestamp of the last occurrence of this event.
  *  `reason`:  Short, machine understandable string that gives the reason for the transition to the object's current status.
- *  `message`:  String that describes the details of the event.
- *  `involvedObject`:  `V1ObjectReference` object that describes the Kubernetes resources with which this event is associated.
+ *  `note`:  String that describes the details of the event.
+ *  `regarding`:  `V1ObjectReference` object that describes the Kubernetes resources with which this event is associated.
     *  `name`:  String that describes the name of the resource with which the event is associated. It may be the `domainUID`, the name of the namespace that the operator watches, or the name of the operator pod.
     *  `namespace`:  String that describes the namespace of the event, which is either the namespace of the domain resource or the namespace of the operator.
     *  `kind`:  String that describes the kind of resource this object represents. The value is `Domain` for a domain event, `Namespace` for a namespace event in the domain namespace, or `Pod` for the operator pod.

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

@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import io.kubernetes.client.openapi.models.CoreV1Event;
+import io.kubernetes.client.openapi.models.EventsV1Event;
 import io.kubernetes.client.openapi.models.V1ResourceRequirements;
 import io.kubernetes.client.util.Yaml;
 import oracle.weblogic.domain.DomainResource;
@@ -198,18 +198,18 @@ private static void checkServerPodsAndServiceReady() {
   }
 
   private Callable<Boolean> checkEvictionEvent(String adminServerpodName,
-      String reason, String message, String type) {
+      String reason, String note, String type) {
     return (() -> {
       boolean gotEvent = false;
-      List<CoreV1Event> events = Kubernetes.listNamespacedEvents(domainNamespace);
-      for (CoreV1Event event : events) {
+      List<EventsV1Event> events = Kubernetes.listNamespacedEvents(domainNamespace);
+      for (EventsV1Event event : events) {
         if (event.getType() != null && event.getType().equals(type)
-            && event.getInvolvedObject().getName() != null
-            && event.getInvolvedObject().getName().equals(adminServerpodName)
+            && event.getRegarding().getName() != null
+            && event.getRegarding().getName().equals(adminServerpodName)
             && event.getReason() != null
             && event.getReason().equals(reason)
-            && event.getMessage() != null
-            && event.getMessage().contains(message)) {
+            && event.getNote() != null
+            && event.getNote().contains(note)) {
           logger.info(Yaml.dump(event));
           gotEvent = true;
         }

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

@@ -16,7 +16,7 @@
 
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.ApiException;
-import io.kubernetes.client.openapi.models.CoreV1Event;
+import io.kubernetes.client.openapi.models.EventsV1Event;
 import io.kubernetes.client.openapi.models.V1LocalObjectReference;
 import io.kubernetes.client.openapi.models.V1ResourceRequirements;
 import io.kubernetes.client.util.Yaml;
@@ -392,8 +392,8 @@ void testHPAWithCustomMetrics() {
         logger.info("Executing command " + command);
         result = ExecCommand.exec(command);
         logger.info(" Result output: " + result.stdout());
-        List<CoreV1Event> events = getEvents(domainNamespace,timestamp);
-        for (CoreV1Event event : events) {
+        List<EventsV1Event> events = getEvents(domainNamespace,timestamp);
+        for (EventsV1Event event : events) {
           logger.info("Generated events after HPA scaling " + Yaml.dump(event));
         }
         int numberOfManagedSvs = 3;

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

@@ -32,11 +32,13 @@
 import io.kubernetes.client.openapi.apis.BatchV1Api;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.apis.CustomObjectsApi;
+import io.kubernetes.client.openapi.apis.EventsV1Api;
 import io.kubernetes.client.openapi.apis.NetworkingV1Api;
 import io.kubernetes.client.openapi.apis.PolicyV1Api;
 import io.kubernetes.client.openapi.apis.RbacAuthorizationV1Api;
-import io.kubernetes.client.openapi.models.CoreV1Event;
-import io.kubernetes.client.openapi.models.CoreV1EventList;
+import io.kubernetes.client.openapi.models.EventsV1Event;
+import io.kubernetes.client.openapi.models.EventsV1EventList;
+import io.kubernetes.client.openapi.models.EventsV1EventSeries;
 import io.kubernetes.client.openapi.models.V1ClusterRole;
 import io.kubernetes.client.openapi.models.V1ClusterRoleBinding;
 import io.kubernetes.client.openapi.models.V1ClusterRoleBindingList;
@@ -123,6 +125,7 @@ public class Kubernetes {
   // Core Kubernetes API clients
   private static ApiClient apiClient = null;
   private static CoreV1Api coreV1Api = null;
+  private static EventsV1Api eventsV1Api = null;
   private static PolicyV1Api policyV1Api = null;
   private static CustomObjectsApi customObjectsApi = null;
   private static RbacAuthorizationV1Api rbacAuthApi = null;
@@ -153,6 +156,7 @@ public class Kubernetes {
       apiClient.setConnectTimeout(0);
       apiClient.setReadTimeout(0);
       coreV1Api = new CoreV1Api();
+      eventsV1Api = new EventsV1Api();
       policyV1Api = new PolicyV1Api();
       customObjectsApi = new CustomObjectsApi();
       rbacAuthApi = new RbacAuthorizationV1Api();
@@ -1146,13 +1150,13 @@ private static Callable<Boolean> namespaceDeleted(String namespace) {
    * List events in a namespace.
    *
    * @param namespace name of the namespace in which to list events
-   * @return List of {@link CoreV1Event} objects
+   * @return List of {@link EventsV1Event} objects
    * @throws ApiException when listing events fails
    */
-  public static List<CoreV1Event> listNamespacedEvents(String namespace) throws ApiException {
-    List<CoreV1Event> events = null;
+  public static List<EventsV1Event> listNamespacedEvents(String namespace) throws ApiException {
+    List<EventsV1Event> events = null;
     try {
-      CoreV1EventList list = coreV1Api.listNamespacedEvent(
+      EventsV1EventList list = eventsV1Api.listNamespacedEvent(
           namespace, // String | namespace.
           PRETTY, // String | If 'true', then the output is pretty printed.
           ALLOW_WATCH_BOOKMARKS, // Boolean | allowWatchBookmarks requests watch events with type "BOOKMARK".
@@ -1166,8 +1170,8 @@ public static List<CoreV1Event> listNamespacedEvents(String namespace) throws Ap
           TIMEOUT_SECONDS, // Integer | Timeout for the list call.
           Boolean.FALSE // Boolean | Watch for changes to the described resources.
       );
-      events = Optional.ofNullable(list).map(CoreV1EventList::getItems).orElse(Collections.emptyList());
-      events.sort(Comparator.comparing(CoreV1Event::getLastTimestamp,
+      events = Optional.ofNullable(list).map(EventsV1EventList::getItems).orElse(Collections.emptyList());
+      events.sort(Comparator.comparing(Kubernetes::getEventTime,
           Comparator.nullsFirst(Comparator.naturalOrder())));
       Collections.reverse(events);
     } catch (ApiException apex) {
@@ -1177,17 +1181,22 @@ public static List<CoreV1Event> listNamespacedEvents(String namespace) throws Ap
     return events;
   }
 
+  private static OffsetDateTime getEventTime(EventsV1Event event) {
+    return Optional.ofNullable(event.getSeries())
+        .map(EventsV1EventSeries::getLastObservedTime).orElse(event.getEventTime());
+  }
+
   /**
    * List operator generated events in a namespace.
    *
    * @param namespace name of the namespace in which to list events
-   * @return List of {@link CoreV1Event} objects
+   * @return List of {@link EventsV1Event} objects
    * @throws ApiException when listing events fails
    */
-  public static List<CoreV1Event> listOpGeneratedNamespacedEvents(String namespace) throws ApiException {
-    List<CoreV1Event> events = null;
+  public static List<EventsV1Event> listOpGeneratedNamespacedEvents(String namespace) throws ApiException {
+    List<EventsV1Event> events = null;
     try {
-      CoreV1EventList list = coreV1Api.listNamespacedEvent(
+      EventsV1EventList list = eventsV1Api.listNamespacedEvent(
           namespace, // String | namespace.
           PRETTY, // String | If 'true', then the output is pretty printed.
           ALLOW_WATCH_BOOKMARKS, // Boolean | allowWatchBookmarks requests watch events with type "BOOKMARK".
@@ -1201,8 +1210,8 @@ public static List<CoreV1Event> listOpGeneratedNamespacedEvents(String namespace
           TIMEOUT_SECONDS, // Integer | Timeout for the list call.
           Boolean.FALSE // Boolean | Watch for changes to the described resources.
       );
-      events = Optional.ofNullable(list).map(CoreV1EventList::getItems).orElse(Collections.emptyList());
-      events.sort(Comparator.comparing(CoreV1Event::getLastTimestamp,
+      events = Optional.ofNullable(list).map(EventsV1EventList::getItems).orElse(Collections.emptyList());
+      events.sort(Comparator.comparing(Kubernetes::getEventTime,
           Comparator.nullsFirst(Comparator.naturalOrder())));
       Collections.reverse(events);
     } catch (ApiException apex) {