Merge remote-tracking branch 'origin/domain-introspector' into owls69363-part2

Author: doxiao

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -315,19 +315,26 @@ public void callWebAppAndVerifyLoadBalancing(String webappName, boolean verifyLo
       if (loadBalancer.equals("APACHE")) {
         testAppUrl.append("weblogic/");
       }
-      testAppUrl.append(webappName).append("/"); // curl cmd to call webapp
-      StringBuffer curlCmd = new StringBuffer("curl --silent --show-error --noproxy ");
+      testAppUrl.append(webappName).append("/");
+      // curl cmd to call webapp
+      StringBuffer curlCmd = new StringBuffer("curl --silent ");
       curlCmd
-          .append(TestUtils.getHostName())
-          .append(" ")
-          .append(testAppUrl.toString()); // curl cmd to get response code
+          .append(" -H 'host: ")
+          .append(domainUid)
+          .append(".org' ")
+          .append(testAppUrl.toString());
+
+      // curl cmd to get response code
       StringBuffer curlCmdResCode = new StringBuffer(curlCmd.toString());
-      curlCmdResCode.append(
-          " --write-out %{http_code} -o /dev/null"); // call webapp iteratively till its
-      // deployed/ready
-      callWebAppAndWaitTillReady(
-          curlCmdResCode
-              .toString()); // execute curl and look for the managed server name in response
+      curlCmdResCode.append(" --write-out %{http_code} -o /dev/null");
+
+      logger.info("Curd cmd with response code " + curlCmdResCode);
+      logger.info("Curd cmd " + curlCmd);
+
+      // call webapp iteratively till its deployed/ready
+      callWebAppAndWaitTillReady(curlCmdResCode.toString());
+
+      // execute curl and look for the managed server name in response
       callWebAppAndCheckForServerNameInResponse(curlCmd.toString(), verifyLoadBalance);
       // logger.info("curlCmd "+curlCmd);
     }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -113,7 +113,8 @@ public static String getHostName() throws Exception {
     if (System.getenv("K8S_NODEPORT_HOST") != null) {
       return System.getenv("K8S_NODEPORT_HOST");
     } else {
-      ExecResult result = ExecCommand.exec("hostname | awk -F. '{print $1}'");
+      // ExecResult result = ExecCommand.exec("hostname | awk -F. '{print $1}'");
+      ExecResult result = ExecCommand.exec("hostname");
       return result.stdout().trim();
     }
   }

model/src/main/java/oracle/kubernetes/weblogic/domain/ClusterConfigurator.java

@@ -4,6 +4,9 @@
 
 package oracle.kubernetes.weblogic.domain;
 
+import io.kubernetes.client.models.V1PodSecurityContext;
+import io.kubernetes.client.models.V1SecurityContext;
+
 /** An interface for an object to configure a cluster in a test. */
 @SuppressWarnings("UnusedReturnValue")
 public interface ClusterConfigurator {
@@ -23,6 +26,16 @@ ClusterConfigurator withReadinessProbeSettings(
   ClusterConfigurator withLivenessProbeSettings(
       Integer initialDelay, Integer timeout, Integer period);
 
+  ClusterConfigurator withNodeSelector(String labelKey, String labelValue);
+
+  ClusterConfigurator withRequestRequirement(String resource, String quantity);
+
+  ClusterConfigurator withLimitRequirement(String resource, String quantity);
+
+  ClusterConfigurator withContainerSecurityContext(V1SecurityContext containerSecurityContext);
+
+  ClusterConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext);
+
   ClusterConfigurator withAdditionalVolume(String name, String path);
 
   ClusterConfigurator withAdditionalVolumeMount(String name, String path);

model/src/main/java/oracle/kubernetes/weblogic/domain/DomainConfigurator.java

@@ -6,6 +6,8 @@
 
 import io.kubernetes.client.models.V1LocalObjectReference;
 import io.kubernetes.client.models.V1ObjectMeta;
+import io.kubernetes.client.models.V1PodSecurityContext;
+import io.kubernetes.client.models.V1SecurityContext;
 import java.util.Arrays;
 import javax.annotation.Nonnull;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
@@ -247,4 +249,59 @@ protected String getAsName() {
   public abstract ClusterConfigurator configureCluster(@Nonnull String clusterName);
 
   public abstract void setShuttingDown(boolean start);
+
+  /**
+   * Add a node label to the Domain's node selector
+   *
+   * @param labelKey the pod label key
+   * @param labelValue the pod label value
+   * @return this object
+   */
+  public abstract DomainConfigurator withNodeSelector(String labelKey, String labelValue);
+
+  /**
+   * Add a resource requirement at domain level. The requests for memory are measured in bytes. You
+   * can express memory as a plain integer or as a fixed-point integer using one of these suffixes:
+   * E, P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
+   * requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
+   * same as 0.1
+   *
+   * @param resource the resource to be added as requirement cpu or memory
+   * @param quantity the quantity required for the resource
+   * @return this object
+   */
+  public abstract DomainConfigurator withRequestRequirement(String resource, String quantity);
+
+  /**
+   * Add a resource limit at domain level, the requests for memory are measured in bytes. You can
+   * express memory as a plain integer or as a fixed-point integer using one of these suffixes: E,
+   * P, T, G, M, K. You can also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki. The
+   * requests for cpu are mesured in cpu units and can be expressed in millicores i.e. 100m is the
+   * same as 0.1
+   *
+   * @param resource the resource to be added as requirement cpu or memory
+   * @param quantity the quantity required for the resource
+   * @return this object
+   */
+  public abstract DomainConfigurator withLimitRequirement(String resource, String quantity);
+
+  /**
+   * Add security constraints at container level, if the same constraint is also defined at pod
+   * level then container constraint take precedence
+   *
+   * @param containerSecurityContext the security context object
+   * @return this object
+   */
+  public abstract DomainConfigurator withContainerSecurityContext(
+      V1SecurityContext containerSecurityContext);
+
+  /**
+   * Add security constraints at container level, if the same constraint is also defined at pod
+   * level then container constraint take precedence
+   *
+   * @param podSecurityContext
+   * @return this object
+   */
+  public abstract DomainConfigurator withPodSecurityContext(
+      V1PodSecurityContext podSecurityContext);
 }

model/src/main/java/oracle/kubernetes/weblogic/domain/ServerConfigurator.java

@@ -4,6 +4,9 @@
 
 package oracle.kubernetes.weblogic.domain;
 
+import io.kubernetes.client.models.V1PodSecurityContext;
+import io.kubernetes.client.models.V1SecurityContext;
+
 /** An interface for an object to configure a server in a test. */
 @SuppressWarnings("UnusedReturnValue")
 public interface ServerConfigurator {
@@ -21,6 +24,16 @@ ServerConfigurator withLivenessProbeSettings(
   ServerConfigurator withReadinessProbeSettings(
       Integer initialDelay, Integer timeout, Integer period);
 
+  ServerConfigurator withNodeSelector(String labelKey, String labelValue);
+
+  ServerConfigurator withRequestRequirement(String resource, String quantity);
+
+  ServerConfigurator withLimitRequirement(String resource, String quantity);
+
+  ServerConfigurator withContainerSecurityContext(V1SecurityContext containerSecurityContext);
+
+  ServerConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext);
+
   ServerConfigurator withAdditionalVolume(String name, String path);
 
   ServerConfigurator withAdditionalVolumeMount(String name, String path);

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/BaseConfiguration.java

@@ -7,9 +7,13 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import io.kubernetes.client.models.V1EnvVar;
+import io.kubernetes.client.models.V1PodSecurityContext;
+import io.kubernetes.client.models.V1ResourceRequirements;
+import io.kubernetes.client.models.V1SecurityContext;
 import io.kubernetes.client.models.V1Volume;
 import io.kubernetes.client.models.V1VolumeMount;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Nullable;
 import oracle.kubernetes.json.Description;
@@ -122,6 +126,42 @@ ProbeTuning getReadinessProbe() {
     return serverPod.getReadinessProbeTuning();
   }
 
+  void addNodeSelector(String labelKey, String labelValue) {
+    serverPod.addNodeSelector(labelKey, labelValue);
+  }
+
+  Map<String, String> getNodeSelector() {
+    return serverPod.getNodeSelector();
+  }
+
+  public V1ResourceRequirements getResources() {
+    return serverPod.getResourceRequirements();
+  }
+
+  void addRequestRequirement(String resource, String quantity) {
+    serverPod.addRequestRequirement(resource, quantity);
+  }
+
+  void addLimitRequirement(String resource, String quantity) {
+    serverPod.addLimitRequirement(resource, quantity);
+  }
+
+  public V1PodSecurityContext getPodSecurityContext() {
+    return serverPod.getPodSecurityContext();
+  }
+
+  public V1SecurityContext getContainerSecurityContext() {
+    return serverPod.getContainerSecurityContext();
+  }
+
+  public void setPodSecurityContext(V1PodSecurityContext podSecurityContext) {
+    serverPod.setPodSecurityContext(podSecurityContext);
+  }
+
+  public void setContainerSecurityContext(V1SecurityContext containerSecurityContext) {
+    serverPod.setContainerSecurityContext(containerSecurityContext);
+  }
+
   public List<V1Volume> getAdditionalVolumes() {
     return serverPod.getAdditionalVolumes();
   }

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Configurator.java

@@ -9,6 +9,8 @@
 import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_ALWAYS;
 import static oracle.kubernetes.weblogic.domain.v2.ConfigurationConstants.START_NEVER;
 
+import io.kubernetes.client.models.V1PodSecurityContext;
+import io.kubernetes.client.models.V1SecurityContext;
 import java.util.Arrays;
 import javax.annotation.Nonnull;
 import oracle.kubernetes.operator.KubernetesConstants;
@@ -161,6 +163,37 @@ private Server createManagedServer(String serverName) {
     return server;
   }
 
+  @Override
+  public DomainConfigurator withNodeSelector(String labelKey, String labelValue) {
+    ((BaseConfiguration) getDomainSpec()).addNodeSelector(labelKey, labelValue);
+    return this;
+  }
+
+  @Override
+  public DomainConfigurator withRequestRequirement(String resource, String quantity) {
+    ((BaseConfiguration) getDomainSpec()).addRequestRequirement(resource, quantity);
+    return this;
+  }
+
+  @Override
+  public DomainConfigurator withLimitRequirement(String resource, String quantity) {
+    ((BaseConfiguration) getDomainSpec()).addLimitRequirement(resource, quantity);
+    return this;
+  }
+
+  @Override
+  public DomainConfigurator withContainerSecurityContext(
+      V1SecurityContext containerSecurityContext) {
+    ((BaseConfiguration) getDomainSpec()).setContainerSecurityContext(containerSecurityContext);
+    return this;
+  }
+
+  @Override
+  public DomainConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext) {
+    ((BaseConfiguration) getDomainSpec()).setPodSecurityContext(podSecurityContext);
+    return this;
+  }
+
   class ServerConfiguratorImpl implements ServerConfigurator {
     private Server server;
 
@@ -205,6 +238,37 @@ public ServerConfigurator withReadinessProbeSettings(
       return this;
     }
 
+    @Override
+    public ServerConfigurator withRequestRequirement(String resource, String quantity) {
+      server.addRequestRequirement(resource, quantity);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withNodeSelector(String labelKey, String labelValue) {
+      server.addNodeSelector(labelKey, labelValue);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withLimitRequirement(String resource, String quantity) {
+      server.addLimitRequirement(resource, quantity);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withContainerSecurityContext(
+        V1SecurityContext containerSecurityContext) {
+      server.setContainerSecurityContext(containerSecurityContext);
+      return this;
+    }
+
+    @Override
+    public ServerConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext) {
+      server.setPodSecurityContext(podSecurityContext);
+      return this;
+    }
+
     @Override
     public ServerConfigurator withAdditionalVolume(String name, String path) {
       server.addAdditionalVolume(name, path);
@@ -294,6 +358,37 @@ public ClusterConfigurator withLivenessProbeSettings(
       return this;
     }
 
+    @Override
+    public ClusterConfigurator withNodeSelector(String labelKey, String labelValue) {
+      cluster.addNodeSelector(labelKey, labelValue);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withRequestRequirement(String resource, String quantity) {
+      cluster.addRequestRequirement(resource, quantity);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withLimitRequirement(String resource, String quantity) {
+      cluster.addLimitRequirement(resource, quantity);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withContainerSecurityContext(
+        V1SecurityContext containerSecurityContext) {
+      cluster.setContainerSecurityContext(containerSecurityContext);
+      return this;
+    }
+
+    @Override
+    public ClusterConfigurator withPodSecurityContext(V1PodSecurityContext podSecurityContext) {
+      cluster.setPodSecurityContext(podSecurityContext);
+      return this;
+    }
+
     @Override
     public ClusterConfigurator withAdditionalVolume(String name, String path) {
       cluster.addAdditionalVolume(name, path);