Merge branch 'support-initcontainer-introspector-main' into 'main'

support init containers for introspector pod, ported from 4.2

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

Author: rjeberhard

documentation/domains/Domain.json

@@ -782,6 +782,13 @@
           "items": {
             "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.28.2/_definitions.json#/definitions/io.k8s.api.core.v1.EnvFromSource"
           }
+        },
+        "initContainers": {
+          "description": "List of init containers for the introspector Job Pod. These containers run after the auxiliary image init container. See `kubectl explain pods.spec.initContainers`.",
+          "type": "array",
+          "items": {
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.28.2/_definitions.json#/definitions/io.k8s.api.core.v1.Container"
+          }
         }
       }
     },

documentation/domains/Domain.md

@@ -278,6 +278,7 @@ The current status of the operation of the WebLogic domain. Updated automaticall
 | --- | --- | --- |
 | `env` | Array of [Env Var](k8s1.28.2.md#env-var) | A list of environment variables to set in the Introspector Job Pod container. More info: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/#jvm-memory-and-java-option-environment-variables. See `kubectl explain pods.spec.containers.env`. |
 | `envFrom` | Array of [Env From Source](k8s1.28.2.md#env-from-source) | List of sources to populate environment variables in the Introspector Job Pod container. The sources include either a config map or a secret. The operator will not expand the dependent variables in the 'envFrom' source. More details: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#define-an-environment-variable-for-a-container. Also see: https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/#jvm-memory-and-java-option-environment-variables. |
+| `initContainers` | Array of [Container](k8s1.28.2.md#container) | List of init containers for the introspector Job Pod. These containers run after the auxiliary image init container. See `kubectl explain pods.spec.initContainers`. |
 | `podSecurityContext` | [Pod Security Context](k8s1.28.2.md#pod-security-context) | Pod-level security attributes. See `kubectl explain pods.spec.securityContext`. If no value is specified for this field, the operator will use default content for the pod-level `securityContext`. More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/. |
 | `resources` | [Resource Requirements](k8s1.28.2.md#resource-requirements) | Memory and CPU minimum requirements and limits for the Introspector Job Pod. See `kubectl explain pods.spec.containers.resources`. |
 

kubernetes/crd/domain-crd.yaml

@@ -190,6 +190,11 @@ private List<V1EnvVar> getIntrospectorEnvVariables() {
         .map(EffectiveIntrospectorJobPodSpec::getEnv).orElse(new ArrayList<>());
   }
 
+  private List<V1Container> getIntrospectorInitContainers() {
+    return Optional.ofNullable(getDomain().getIntrospectorSpec())
+            .map(EffectiveIntrospectorJobPodSpec::getInitContainers).orElse(new ArrayList<>());
+  }
+
   private List<V1EnvVar> getAdminServerEnvVariables() {
     return Optional.ofNullable(getDomain().getAdminServerSpec()).map(EffectiveServerSpec::getEnvironmentVariables)
         .orElse(new ArrayList<>());
@@ -471,6 +476,11 @@ private void addInitContainers(List<V1Container> initContainers, List<? extends
     IntStream.range(0, auxiliaryImages.size()).forEach(idx ->
         initContainers.add(createInitContainerForAuxiliaryImage(auxiliaryImages.get(idx), idx,
                 isInitializeDomainOnPV())));
+    List<V1Container> introspectorInitContainers = getIntrospectorInitContainers();
+    for (V1Container initContainer : introspectorInitContainers) {
+      initContainer.securityContext(getInitContainerSecurityContext());
+      initContainers.add(initContainer);
+    }
   }
 
   private Optional<InitializeDomainOnPV> getInitializeDomainOnPV() {

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

@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1EnvFromSource;
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1PodSecurityContext;
@@ -28,4 +29,6 @@ public interface EffectiveIntrospectorJobPodSpec {
   V1ResourceRequirements getResources();
 
   V1PodSecurityContext getPodSecurityContext();
+
+  List<V1Container> getInitContainers();
 }

operator/src/main/java/oracle/kubernetes/operator/processing/EffectiveIntrospectorJobPodSpec.java

@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1EnvFromSource;
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1PodSecurityContext;
@@ -48,4 +49,10 @@ public V1ResourceRequirements getResources() {
   public V1PodSecurityContext getPodSecurityContext() {
     return introspector.getPodSecurityContext();
   }
+
+  @Override
+  public List<V1Container> getInitContainers() {
+    return introspector.getInitContainers();
+  }
+
 }

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/EffectiveIntrospectorJobPodSpecCommonImpl.java

@@ -11,6 +11,7 @@
 import javax.annotation.Nullable;
 
 import io.kubernetes.client.custom.Quantity;
+import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1EnvFromSource;
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1PodSecurityContext;
@@ -74,6 +75,16 @@ class IntrospectorJobPod {
       + "More info: https://oracle.github.io/weblogic-kubernetes-operator/security/domain-security/pod-and-container/.")
   private V1PodSecurityContext podSecurityContext = null;
 
+  /**
+   * InitContainers holds a list of initialization containers that run after the auxiliary image init
+   * container for the introspector job pod.
+   *
+   */
+  @Valid
+  @Description("List of init containers for the introspector Job Pod. These containers run after the auxiliary image "
+         + "init container. See `kubectl explain pods.spec.initContainers`.")
+  private List<V1Container> initContainers = null;
+
   private static void copyValues(V1ResourceRequirements to, V1ResourceRequirements from) {
     if (from != null) {
       if (from.getRequests() != null) {
@@ -142,6 +153,12 @@ void fillInFrom(IntrospectorJobPod serverPod1) {
       }
       envFrom.addAll(serverPod1.envFrom);
     }
+    if (serverPod1.initContainers != null) {
+      if (initContainers == null) {
+        initContainers = new ArrayList<>();
+      }
+      initContainers.addAll(serverPod1.initContainers);
+    }
     copyValues(resources, serverPod1.resources);
     copyValues(serverPod1.podSecurityContext);
   }
@@ -156,6 +173,14 @@ private List<V1EnvVar> getV1EnvVars() {
     return Optional.ofNullable(getEnv()).orElse(emptyList());
   }
 
+  List<V1Container> getInitContainers() {
+    return Optional.ofNullable(initContainers).orElse(emptyList());
+  }
+
+  void setInitContainers(@Nullable List<V1Container> initContainers) {
+    this.initContainers = initContainers;
+  }
+
   private boolean hasEnvVar(String name) {
     if (env == null) {
       return false;
@@ -219,6 +244,7 @@ public String toString() {
         .append("resources", resources)
         .append("envFrom", envFrom)
         .append("podSecurityContext", podSecurityContext)
+        .append("initContainers", initContainers)
         .toString();
   }
 
@@ -241,6 +267,7 @@ public boolean equals(Object o) {
         .append(resources, that.resources)
         .append(envFrom, that.envFrom)
         .append(podSecurityContext, that.podSecurityContext)
+        .append(initContainers, that.initContainers)
         .isEquals();
   }
 
@@ -252,6 +279,7 @@ public int hashCode() {
         .append(resources)
         .append(envFrom)
         .append(podSecurityContext)
+        .append(initContainers)
         .toHashCode();
   }
 }

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/IntrospectorJobPod.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
+import io.kubernetes.client.openapi.models.V1Container;
 import io.kubernetes.client.openapi.models.V1EnvFromSource;
 import io.kubernetes.client.openapi.models.V1EnvVar;
 import io.kubernetes.client.openapi.models.V1PodSecurityContext;
@@ -48,6 +49,10 @@ public void setEnv(@Nullable List<V1EnvVar> env) {
     serverPod.setEnv(env);
   }
 
+  public List<V1Container> getInitContainers() {
+    return serverPod.getInitContainers();
+  }
+
   void addEnvironmentVariable(String name, String value) {
     serverPod.addEnvVar(new V1EnvVar().name(name).value(value));
   }