Nginx mii new it (#1614)

* init commit

* use kubernetes API call to create ingress

* add more debug info for Jenkins run

* add more debug info for Jenkins run

* add more debug info for Jenkins run

* remove debug info for Jenkins run

* remove unused imports

* uninstall nginx release for now

* cleanup

* more cleanup

* cleanup

* change DynamicClusterSize in sample wdt model file

* resolve merge conflicts

* fix with Mark's comments

Co-authored-by: Ryan Eberhard <ryan.eberhard@oracle.com>

Author: xiancao

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleNginxValidation.java

@@ -3,8 +3,11 @@
 
 package oracle.weblogic.kubernetes;
 
+import java.net.InetAddress;
 import java.util.Optional;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 public interface TestConstants {
 
   // operator constants
@@ -30,8 +33,14 @@ public interface TestConstants {
       .orElse("");
   public static final String BRANCH_NAME_FROM_JENKINS = Optional.ofNullable(System.getenv("BRANCH"))
       .orElse("");
+  public static final String K8S_NODEPORT_HOST = Optional.ofNullable(System.getenv("K8S_NODEPORT_HOST"))
+        .orElse(assertDoesNotThrow(() -> InetAddress.getLocalHost().getHostName()));
+  public static final String GOOGLE_REPO_URL = "https://kubernetes-charts.storage.googleapis.com/";
   public static final String LOGS_DIR = System.getenv().getOrDefault("RESULT_ROOT",
       System.getProperty("java.io.tmpdir")) + "/diagnosticlogs";
   public static final String PV_ROOT = System.getenv().getOrDefault("PV_ROOT",
       System.getProperty("java.io.tmpdir")) + "/ittestspvroot";
+  public static final String NGINX_RELEASE_NAME = "nginx-release" + BUILD_ID;
+  public static final String STABLE_REPO_NAME = "stable";
+  public static final String NGINX_CHART_NAME = "nginx-ingress";
 }

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

@@ -25,15 +25,15 @@
 import oracle.weblogic.kubernetes.actions.impl.Domain;
 import oracle.weblogic.kubernetes.actions.impl.Exec;
 import oracle.weblogic.kubernetes.actions.impl.Namespace;
+import oracle.weblogic.kubernetes.actions.impl.Nginx;
+import oracle.weblogic.kubernetes.actions.impl.NginxParams;
 import oracle.weblogic.kubernetes.actions.impl.Operator;
 import oracle.weblogic.kubernetes.actions.impl.OperatorParams;
 import oracle.weblogic.kubernetes.actions.impl.PersistentVolume;
 import oracle.weblogic.kubernetes.actions.impl.PersistentVolumeClaim;
 import oracle.weblogic.kubernetes.actions.impl.Secret;
 import oracle.weblogic.kubernetes.actions.impl.Service;
 import oracle.weblogic.kubernetes.actions.impl.ServiceAccount;
-import oracle.weblogic.kubernetes.actions.impl.Traefik;
-import oracle.weblogic.kubernetes.actions.impl.TraefikParams;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Docker;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Helm;
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
@@ -45,13 +45,12 @@
 // detail impl classes - tests would only ever call methods in here, never
 // directly call the methods in the impl classes
 public class TestActions {
-
   // ----------------------   operator  ---------------------------------
 
   /**
    * Install WebLogic Kubernetes Operator.
    *
-   * @param params operator parameters for helm values
+   * @param params operator parameters for Helm values
    * @return true if the operator is successfully installed, false otherwise.
    */
   public static boolean installOperator(OperatorParams params) {
@@ -61,7 +60,7 @@ public static boolean installOperator(OperatorParams params) {
   /**
    * Upgrade existing Operator release.
    *
-   * @param params operator parameters for helm values
+   * @param params operator parameters for Helm values
    * @return true if the operator is successfully upgraded, false otherwise.
    */
   public static boolean upgradeOperator(OperatorParams params) {
@@ -83,7 +82,7 @@ public static boolean scaleDomain(String domainUid, String clusterName, int numO
   /**
    * Uninstall the Operator release.
    *
-   * @param params the parameters to helm uninstall command, release name and namespace
+   * @param params the parameters to Helm uninstall command, release name and namespace
    * @return true on success, false otherwise
    */
 
@@ -192,26 +191,52 @@ public static boolean patchDomainCustomResource(String domainUid, String namespa
     return Domain.patchDomainCustomResource(domainUid, namespace, patch, patchFormat);
   }
 
-  // ------------------------   ingress controller ----------------------
+  // ------------------------   Ingress Controller ----------------------
 
   /**
-   * Install Traefik Operator.
+   * Install NGINX ingress controller.
    *
-   * @param params parameters for helm values
+   * @param params the parameters to Helm install command, such as release name, namespace, repo url,
+   *               repo name and chart name
    * @return true on success, false otherwise
    */
-  public static boolean installTraefik(TraefikParams params) {
-    return Traefik.install(params);
+  public static boolean installNginx(NginxParams params) {
+    return Nginx.install(params);
   }
 
   /**
-   * Create Treafik Ingress.
+   * Create an ingress for the WebLogic domain with domainUid in the specified domain namespace.
    *
-   * @param valuesYaml values yaml file to be used
+   * @param domainNamespace the WebLogic domain namespace in which to create the ingress
+   * @param domainUid WebLogic domainUid which is backend to the ingress
+   * @param clusterName the name of the WebLogic domain cluster
+   * @param managedServerPort the port number of the WebLogic domain managed servers
    * @return true on success, false otherwise
+   * @throws ApiException if Kubernetes client API call fails
    */
-  public static boolean createIngress(String valuesYaml) {
-    return Traefik.createIngress(valuesYaml);
+  public static boolean createIngress(String domainNamespace, String domainUid, String clusterName,
+                                      int managedServerPort) throws ApiException {
+    return Nginx.createIngress(domainNamespace, domainUid, clusterName, managedServerPort);
+  }
+
+  /**
+   * Upgrade NGINX release.
+   *
+   * @param params the parameters to Helm upgrade command, such as release name and http/https nodeport
+   * @return true on success, false otherwise
+   */
+  public static boolean upgradeNginx(NginxParams params) {
+    return Nginx.upgrade(params);
+  }
+
+  /**
+   * Uninstall the NGINX release.
+   *
+   * @param params the parameters to Helm uninstall command, such as release name and namespace
+   * @return true on success, false otherwise
+   */
+  public static boolean uninstallNginx(HelmParams params) {
+    return Nginx.uninstall(params);
   }
 
   // -------------------------  namespaces -------------------------------
@@ -454,7 +479,7 @@ public static boolean deleteClusterRoleBinding(String name) {
     return ClusterRoleBinding.delete(name);
   }
 
-  // ----------------------- helm -----------------------------------
+  // ----------------------- Helm -----------------------------------
 
   /**
    * List releases.
@@ -535,6 +560,19 @@ public static JsonObject createDockerConfigJson(String username, String password
     return Docker.createDockerConfigJson(username, password, email, registry);
   }
 
+  // ------------------------ Ingress -------------------------------------
+
+  /**
+   * Get a list of ingress names in the specified namespace.
+   *
+   * @param namespace in which to list all the ingresses
+   * @return list of ingress names in the specified namespace
+   * @throws ApiException if Kubernetes client API call fails
+   */
+  public static List<String> getIngressList(String namespace) throws ApiException {
+    return Nginx.getIngressList(namespace);
+  }
+
   // ----------------------- Execute a Command   ---------------------------
 
   /**

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/TestActions.java

@@ -0,0 +1,146 @@
+// Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package oracle.weblogic.kubernetes.actions.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import io.kubernetes.client.custom.IntOrString;
+import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1HTTPIngressPath;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1HTTPIngressRuleValue;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1Ingress;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1IngressBackend;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1IngressList;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1IngressRule;
+import io.kubernetes.client.openapi.models.ExtensionsV1beta1IngressSpec;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import oracle.weblogic.kubernetes.actions.impl.primitive.Helm;
+import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
+import oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes;
+
+import static oracle.weblogic.kubernetes.extensions.LoggedTest.logger;
+
+/**
+ * Utility class for NGINX ingress controller.
+ */
+public class Nginx {
+
+  private static final String INGRESS_API_VERSION = "extensions/v1beta1";
+  private static final String INGRESS_KIND = "Ingress";
+  private static final String INGRESS_NGINX_CLASS = "nginx";
+
+  /**
+   * Install NGINX Helm chart.
+   *
+   * @param params the parameters to Helm install command such as release name, namespace, repo url or chart dir,
+   *               chart name and chart values
+   * @return true on success, false otherwise
+   */
+  public static boolean install(NginxParams params) {
+    return Helm.install(params.getHelmParams(), params.getValues());
+  }
+
+  /**
+   * Upgrade NGINX Helm release.
+   *
+   * @param params the parameters to Helm upgrade command such as release name, namespace and chart values to override
+   * @return true on success, false otherwise
+   */
+  public static boolean upgrade(NginxParams params) {
+    return Helm.upgrade(params.getHelmParams(), params.getValues());
+  }
+
+  /**
+   * Uninstall NGINX Helm release.
+   *
+   * @param params the parameters to Helm uninstall command such as release name and namespace
+   * @return true on success, false otherwise
+   */
+  public static boolean uninstall(HelmParams params) {
+    return Helm.uninstall(params);
+  }
+
+  /**
+   * Create an ingress for the WebLogic domain with domainUid in the specified domain namespace.
+   *
+   * @param domainNamespace the WebLogic domain namespace in which the ingress will be created
+   * @param domainUid the WebLogic domainUid which is backend to the ingress
+   * @param clusterName the name of the WebLogic domain cluster
+   * @param managedServerPort the port number of the WebLogic domain managed servers
+   * @return true on success, false otherwise
+   * @throws ApiException if Kubernetes client API call fails
+   */
+  public static boolean createIngress(String domainNamespace,
+                                      String domainUid,
+                                      String clusterName,
+                                      int managedServerPort) throws ApiException {
+
+    // set the annotation for kubernetes.io/ingress.class to "nginx"
+    HashMap<String, String> annotation = new HashMap<>();
+    annotation.put("kubernetes.io/ingress.class", INGRESS_NGINX_CLASS);
+
+    // set the http ingress paths
+    ExtensionsV1beta1HTTPIngressPath httpIngressPath = new ExtensionsV1beta1HTTPIngressPath()
+        .path(null)
+        .backend(new ExtensionsV1beta1IngressBackend()
+                .serviceName(domainUid + "-cluster-" + clusterName.toLowerCase().replace("_", "-"))
+                .servicePort(new IntOrString(managedServerPort))
+        );
+    ArrayList<ExtensionsV1beta1HTTPIngressPath> httpIngressPaths = new ArrayList<>();
+    httpIngressPaths.add(httpIngressPath);
+
+    // set the ingress rule
+    ExtensionsV1beta1IngressRule ingressRule = new ExtensionsV1beta1IngressRule()
+        .host(domainUid + ".test")
+        .http(new ExtensionsV1beta1HTTPIngressRuleValue()
+              .paths(httpIngressPaths)
+        );
+    ArrayList<ExtensionsV1beta1IngressRule> ingressRules = new ArrayList<>();
+    ingressRules.add(ingressRule);
+
+    // set the ingress
+    ExtensionsV1beta1Ingress ingress = new ExtensionsV1beta1Ingress()
+        .apiVersion(INGRESS_API_VERSION)
+        .kind(INGRESS_KIND)
+        .metadata(new V1ObjectMeta()
+                  .name(domainUid + "-nginx")
+                  .namespace(domainNamespace)
+                  .annotations(annotation))
+        .spec(new ExtensionsV1beta1IngressSpec()
+              .rules(ingressRules));
+
+    // create the ingress
+    try {
+      Kubernetes.createIngress(domainNamespace, ingress);
+    } catch (ApiException apex) {
+      logger.warning(apex.getResponseBody());
+      throw apex;
+    }
+    return true;
+  }
+
+  /**
+   * Get a list of ingress names in the specified namespace.
+   *
+   * @param namespace the namespace to which the ingresses belong
+   * @return a list of ingress names in the namespace
+   * @throws ApiException if Kubernetes client API call fails
+   */
+  public static List<String> getIngressList(String namespace) throws ApiException {
+
+    List<String> ingressNames = new ArrayList<>();
+    ExtensionsV1beta1IngressList ingressList = Kubernetes.listNamespacedIngresses(namespace);
+    List<ExtensionsV1beta1Ingress> listOfIngress = ingressList.getItems();
+
+    listOfIngress.forEach(ingress -> {
+      if (ingress.getMetadata() != null) {
+        ingressNames.add(ingress.getMetadata().getName());
+      }
+    });
+
+    return ingressNames;
+  }
+}

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

@@ -0,0 +1,65 @@
+// Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+package oracle.weblogic.kubernetes.actions.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
+
+/**
+ * All parameters needed to install NGINX ingress controller.
+ */
+public class NginxParams {
+
+  // Only add the values which need to be updated here.
+  // The default values can be found here:
+  // https://github.com/helm/charts/blob/master/stable/nginx-ingress/values.yaml
+  private static final String NODEPORTS_HTTP = "controller.service.nodePorts.http";
+  private static final String NODEPORTS_HTTPS = "controller.service.nodePorts.https";
+
+  // Adding some of the most commonly used params for now
+  private int nodePortsHttp;
+  private int nodePortsHttps;
+  private HelmParams helmParams;
+
+  public NginxParams nodePortsHttp(int nodePortsHttp) {
+    this.nodePortsHttp = nodePortsHttp;
+    return this;
+  }
+
+  public NginxParams nodePortsHttps(int nodePortsHttps) {
+    this.nodePortsHttps = nodePortsHttps;
+    return this;
+  }
+
+  public NginxParams helmParams(HelmParams helmParams) {
+    this.helmParams = helmParams;
+    return this;
+  }
+
+  public HelmParams getHelmParams() {
+    return helmParams;
+  }
+
+  /**
+   * Loads Helm values into a value map.
+   *
+   * @return Map of values
+   */
+  public Map<String, Object> getValues() {
+    Map<String, Object> values = new HashMap<>();
+
+    if (nodePortsHttp > 0) {
+      values.put(NODEPORTS_HTTP, nodePortsHttp);
+    }
+    if (nodePortsHttps > 0) {
+      values.put(NODEPORTS_HTTPS, nodePortsHttps);
+    }
+
+    values.values().removeIf(Objects::isNull);
+    return values;
+  }
+}