Update the Traefik Version to 2.x (#1814)

* Initial check-in for traefik version update

* Modified the doc and sample artifacts files

* Foramt the document

* More doc changes

* Renamed setup.sh to setupLoadBalancer.sh to be more specific as per suggestion on OWLS-77806

* Addressed doc comments on PR review

* More doc review comments

* Minor hypelink name  change

* More doc changes

* Fixed the broken links

* Updated copyright inforrmation

* Doc review comments

* More doc changes

* Minor typo

* Modified the mii sample wraper scripts

* Update Mii Sample script

* Resync develop branch. Modified more scripts and yaml files for mii-sample

* update MII sample generation/test instructions

* Missing modification

* Modified traefik ingress syntax

* Modifoe md files from docs-source directory

* More doc review comment

* Fixed the indention issue in inline ingress file

* More doc review resolution

* Minor doc update

* Move the istio istallatiion to RESULTS_ROOT directory

Co-authored-by: ANTARYAMI.PANIGRAHI@ORACLE.COM <anpanigr@anpanigr-2.subnet1ad3phx.devweblogicphx.oraclevcn.com>
Co-authored-by: Tom Barnes <tom.barnes@oracle.com>

Author: 3 people

docs-source/content/quickstart/cleanup.md

@@ -31,11 +31,10 @@ weight: 7
 1.	Configure the Traefik load balancer to stop managing the ingresses in the domain namespace:
 
     ```bash
-    $ helm upgrade traefik-operator stable/traefik \
+    $ helm upgrade traefik-operator traefik/traefik \
         --namespace traefik \
         --reuse-values \
-        --set "kubernetes.namespaces={traefik}" \
-        --wait
+        --set "kubernetes.namespaces={traefik}" 
     ```
 
 1.	Configure the operator to stop managing the domain:

docs-source/content/quickstart/install.md

@@ -29,7 +29,8 @@ EOF
 First, set up Helm:
 
 ```bash
-$ helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+$ helm repo add traefik https://containous.github.io/traefik-helm-chart/
+$ helm repo update
 ```
 
 #### Create a Traefik (ingress-based) load balancer.
@@ -44,11 +45,10 @@ Use the [values.yaml](http://github.com/oracle/weblogic-kubernetes-operator/blob
 
 
 ```bash
-$ helm install traefik-operator stable/traefik \
+$ helm install traefik-operator traefik/traefik \
     --namespace traefik \
     --values kubernetes/samples/charts/traefik/values.yaml \
-    --set "kubernetes.namespaces={traefik}" \
-    --wait
+    --set "kubernetes.namespaces={traefik}" 
 ```
 
 #### Install the operator.

docs-source/content/quickstart/prepare.md

@@ -25,11 +25,10 @@ weight: 5
 1.  Configure Traefik to manage ingresses created in this namespace:
 
     ```bash
-    $ helm upgrade traefik-operator stable/traefik \
+    $ helm upgrade traefik-operator traefik/traefik \
         --namespace traefik \
         --reuse-values \
-        --set "kubernetes.namespaces={traefik,sample-domain1-ns}" \
-        --wait
+        --set "kubernetes.namespaces={traefik,sample-domain1-ns}" 
     ```
 
 {{% notice note %}}

docs-source/content/samples/simple/domains/model-in-image/cleanup.md

@@ -21,7 +21,7 @@ To remove the resources you have created in these samples:
 2. If you set up the Traefik ingress controller:
 
    ```
-   $ helm delete --purge traefik-operator
+   $ helm uninstall traefik-operator -n traefik
    $ kubectl delete namespace traefik
    ```
 
@@ -32,7 +32,7 @@ To remove the resources you have created in these samples:
 
 4. Delete the operator and its namespace:
    ```
-   $ helm delete --purge sample-weblogic-operator
+   $ helm uninstall sample-weblogic-operator -n sample-weblogic-operator-ns
    $ kubectl delete namespace sample-weblogic-operator-ns
    ```
 

docs-source/content/samples/simple/domains/model-in-image/prerequisites.md

@@ -53,8 +53,8 @@ weight: 1
     - Option 1: To create the ingresses, use the following YAML file to create a file called `/tmp/mii-sample/ingresses/myingresses.yaml` and then call `kubectl apply -f /tmp/mii-sample/ingresses/myingresses.yaml`:
 
        ```yaml
-       apiVersion: networking.k8s.io/v1beta1
-       kind: Ingress
+       apiVersion: traefik.containo.us/v1alpha1
+       kind: IngressRoute
        metadata:
          name: traefik-ingress-sample-domain1-admin-server
          namespace: sample-domain1-ns
@@ -63,17 +63,16 @@ weight: 1
          annotations:
            kubernetes.io/ingress.class: traefik
        spec:
-         rules:
-         - host:
-           http:
-             paths:
-             - path: /console
-               backend:
-                 serviceName: sample-domain1-admin-server
-                 servicePort: 7001
+         routes:
+         - kind: Rule
+           match: PathPrefix(`/console`)
+           services:
+           - kind: Service
+             name: sample-domain1-admin-server
+             port: 7001
        ---
-       apiVersion: networking.k8s.io/v1beta1
-       kind: Ingress
+       apiVersion: traefik.containo.us/v1alpha1
+       kind: IngressRoute
        metadata:
          name: traefik-ingress-sample-domain1-cluster-cluster-1
          namespace: sample-domain1-ns
@@ -82,17 +81,16 @@ weight: 1
          annotations:
            kubernetes.io/ingress.class: traefik
        spec:
-         rules:
-         - host: sample-domain1-cluster-cluster-1.mii-sample.org
-           http:
-             paths:
-             - path:
-               backend:
-                 serviceName: sample-domain1-cluster-cluster-1
-                 servicePort: 8001
+         routes:
+         - kind: Rule
+           match: Host(`sample-domain1-cluster-cluster-1.mii-sample.org`)
+           services:
+           - kind: Service
+             name: sample-domain1-cluster-cluster-1
+             port: 8001
        ---
-       apiVersion: networking.k8s.io/v1beta1
-       kind: Ingress
+       apiVersion: traefik.containo.us/v1alpha1
+       kind: IngressRoute
        metadata:
          name: traefik-ingress-sample-domain2-cluster-cluster-1
          namespace: sample-domain1-ns
@@ -101,14 +99,13 @@ weight: 1
          annotations:
            kubernetes.io/ingress.class: traefik
        spec:
-         rules:
-         - host: sample-domain2-cluster-cluster-1.mii-sample.org
-           http:
-             paths:
-             - path:
-               backend:
-                 serviceName: sample-domain2-cluster-cluster-1
-                 servicePort: 8001
+         routes:
+         - kind: Rule
+           match: Host(`sample-domain2-cluster-cluster-1.mii-sample.org`)
+           services:
+           - kind: Service
+             name: sample-domain2-cluster-cluster-1
+             port: 8001
        ```
 
    - Option 2: Run `kubectl apply -f` on each of the ingress YAML files that are already included in the sample source `/tmp/mii-sample/ingresses` directory:

kubernetes/hands-on-lab/tutorials/install.traefik.ocishell.md

@@ -19,7 +19,7 @@ kubectl create namespace traefik
 Install the Traefik operator in the `traefik` namespace with the provided sample values:
 ```bash
 helm install traefik-operator \
-stable/traefik \
+traefik/traefik \
 --namespace traefik \
 --values kubernetes/samples/charts/traefik/values.yaml  \
 --set "kubernetes.namespaces={traefik}" \

kubernetes/samples/charts/traefik/README.md

@@ -4,102 +4,106 @@ This sample demonstrates how to install the Traefik ingress controller to provid
 load balancing for WebLogic clusters.
 
 ## Install the Traefik operator with a Helm chart
-The Traefik Helm chart is located in the official Helm project `charts` directory at https://github.com/helm/charts/tree/master/stable/traefik.
-The chart is in the default repository for Helm.
+This document is based on Traefik version 2.x with the Helm chart at [Traefik Helm Repository](https://github.com/containous/traefik-helm-chart).
+For more information about Traefik, see the [Traefik Official Site](https://traefik.io/).
 
-To install the Traefik operator in the `traefik` namespace with default settings:
+To install the Traefik operator in the `traefik` namespace with the default settings:
 ```
-$ helm install --name traefik-operator --namespace traefik stable/traefik
+$ helm repo add traefik https://containous.github.io/traefik-helm-chart
+$ helm repo update
+$ kubectl create namespace traefik
+$ helm install traefik-operator traefik/traefik --namespace traefik
 ```
-Or, with a given `values.yaml`:
+You can also install the Traefik operator with a custom `values.yaml` file. For more detailed information, see the [Traefik GitHub Project](https://github.com/containous/traefik-helm-chart/blob/master/traefik/values.yaml).
 ```
-$ helm install --name traefik-operator --namespace traefik --values values.yaml stable/traefik
-```
-With the dashboard enabled, you can access the Traefik dashboard with the URL `http://${HOSTNAME}:30305`, with the HTTP host `traefik.example.com`.
-```
-$ curl -H 'host: traefik.example.com' http://${HOSTNAME}:30305/
-```
-
-## Optionally, download the Traefik Helm chart
-If you want, you can download the Traefik Helm chart and untar it into a local folder:
-```
-$ helm fetch  stable/traefik --untar
-```
-
-## Update the Traefik operator
-After the Traefik operator is installed and running, if you want to change some configurations of the operator, use `helm upgrade` to achieve this.
-```
-$ helm upgrade traefik-operator stable/traefik --values values.yaml 
+$ helm install traefik-operator traefik/traefik --namespace traefik --values values.yaml
 ```
 
-## Configure Traefik as a load balancer for WLS domains
-In this section we'll demonstrate how to use Traefik to handle traffic to backend WLS domains.
+## Configure Traefik as a load balancer for WebLogic domains
+This section describes how to use Traefik to handle traffic to backend WebLogic domains.
 
-### 1. Install WLS domains
-Now we need to prepare some domains for Traefik load balancing.
+### 1. Install WebLogic domains
+First, we need to prepare two domains for Traefik load balancing.
 
-Create two WLS domains:
-- One domain with name `domain1` under namespace `default`.
-- One domain with name `domain2` under namespace `test1`.
+Create two WebLogic domains:
+- One domain with `domain1` as the domain UID and namespace `weblogic-domain1`.
+- One domain with `domain2` as the domain UID and namespace `weblogic-domain2`.
 - Each domain has a web application installed with the URL context `testwebapp`.
+- Each domain has a WebLogic cluster `cluster-1` where each Managed Server listens on port `8001`.
 
-### 2. Install the Traefik Ingress
-#### Install a host-routing Ingress
+### 2. Web request routing 
+The following sections describe how to route an application web request to the WebLogic domain through a Traefik frontend.
+
+#### Host-based routing 
+This sample demonstrates how to access an application on two WebLogic domains using host-based routing. Install a host-based routing Traefik [IngressRoute](https://docs.traefik.io/routing/providers/kubernetes-crd/#kind-ingressroute).
 ```
 $ kubectl create -f samples/host-routing.yaml
+ingressroute.traefik.containo.us/traefik-hostrouting-1 created
+ingressroute.traefik.containo.us/traefik-hostrouting-2 created
 ```
-Now you can send requests to different WLS domains with the unique entry point of Traefik with different hostnames.
+Now you can send requests to different WebLogic domains with the unique Traefik entry point of different host names as defined in the route section of the `host-routing.yaml` file.
 ```
-$ curl -H 'host: domain1.org' http://${HOSTNAME}:30305/testwebapp/
-$ curl -H 'host: domain2.org' http://${HOSTNAME}:30305/testwebapp/
+# Get the ingress controller web port
+$ export LB_PORT=$(kubectl -n traefik get service traefik-operator -o jsonpath='{.spec.ports[?(@.name=="web")].nodePort}')
+$ curl -H 'host: domain1.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/
+$ curl -H 'host: domain2.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/
 ```
-#### Install a path-routing Ingress
+
+#### Path-based routing  
+This sample demonstrates how to access an application on two WebLogic domains using path-based routing. Install a path-based routing Traefik [IngressRoute](https://docs.traefik.io/routing/providers/kubernetes-crd/#kind-ingressroute) and [Middleware](https://docs.traefik.io/middlewares/overview/).
+
 ```
 $ kubectl create -f samples/path-routing.yaml
+ingressroute.traefik.containo.us/traefik-pathrouting-1 created
+middleware.traefik.containo.us/middleware-domain1 created
+ingressroute.traefik.containo.us/traefik-pathrouting-2 created
+middleware.traefik.containo.us/middleware-domain2 created
 ```
-Now you can send requests to different WLS domains with the unique entry point of Traefik with different paths.
+Now you can send requests to different WebLogic domains with the unique Traefik entry point of different paths, as defined in the route section of the `path-routing.yaml` file.
 ```
-$ curl http://${HOSTNAME}:30305/domain1/
-$ curl http://${HOSTNAME}:30305/domain2/
+# Get the ingress controller web port
+$ export LB_PORT=$(kubectl -n traefik get service traefik-operator -o jsonpath='{.spec.ports[?(@.name=="web")].nodePort}')
+$ curl http://${HOSTNAME}:${LB_PORT}/domain1/
+$ curl http://${HOSTNAME}:${LB_PORT}/domain2/
 ```
-#### Install a TLS-enabled Ingress
-This sample demonstrates accessing the two WLS domains using an HTTPS endpoint and the WLS domains are protected by different TLS certificates.
-
-To make this sample work, you need to enable the TLS endpoint in the Traefik operator. If you use the `values.yaml` file in the same folder as this README, the TLS endpoint is already enabled.
+#### Host-based secured routing 
+This sample demonstrates how to access an application on two WebLogic domains using an HTTPS endpoint. Install a TLS-enabled Traefik [IngressRoute](https://docs.traefik.io/routing/providers/kubernetes-crd/#kind-ingressroute).
 
-First, you need to create two secrets with TLS certificates, one with the common name `domain1.org`, the other with the common name `domain2.org`. We use `openssl` to generate self-signed certificates for demonstration purposes. Note that the TLS secret needs to be in the same namespace as the WLS domain.
+First, you need to create two secrets with TLS certificates, one with the common name `domain1.org`, the other with the common name `domain2.org`. We use `openssl` to generate self-signed certificates for demonstration purposes. Note that the TLS secret needs to be in the same namespace as the WebLogic domain.
 ```
 # create a TLS secret for domain1
 $ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/tls1.key -out /tmp/tls1.crt -subj "/CN=domain1.org"
-$ kubectl create secret tls domain1-tls-cert --key /tmp/tls1.key --cert /tmp/tls1.crt
-
+$ kubectl -n weblogic-domain1 create secret tls domain1-tls-cert --key /tmp/tls1.key --cert /tmp/tls1.crt
 # create a TLS secret for domain2
 $ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /tmp/tls2.key -out /tmp/tls2.crt -subj "/CN=domain2.org"
-$ kubectl -n test1 create secret tls domain2-tls-cert --key /tmp/tls2.key --cert /tmp/tls2.crt
-```
-Then deploy the TLS Ingress.
-```
+$ kubectl -n weblogic-domain2 create secret tls domain2-tls-cert --key /tmp/tls2.key --cert /tmp/tls2.crt
+
+# Deploy a TLS IngressRoute.
 $ kubectl create -f samples/tls.yaml
+ingressroute.traefik.containo.us/traefik-tls-1 created
+ingressroute.traefik.containo.us/traefik-tls-2 created
 ```
-Now you can access the two WLS domains with different hostnames using the HTTPS endpoint.
+Now you can access the application on the WebLogic domain with the host name in the HTTP header.
+The ingress controller secure port can be obtained dynamically from the `traefik-operator` service in the `traefik` namespace.
 ```
-$ curl -k -H 'host: domain1.org' https://${HOSTNAME}:30443/testwebapp/
-$ curl -k -H 'host: domain2.org' https://${HOSTNAME}:30443/testwebapp/
+# Get the ingress controller secure web port
+TLS_PORT=`kubectl -n traefik get service traefik-operator -o jsonpath='{.spec.ports[?(@.name=="websecure")].nodePort}'`
+$ curl -k -H 'host: domain1.org' https://${HOSTNAME}:${TLS_PORT}/testwebapp/
 ```
 
 ## Uninstall the Traefik operator
-After removing all the Ingress resources, uninstall the Traefik operator:
+After removing all the ingress resources, uninstall the Traefik operator:
 ```
-$ helm delete --purge traefik-operator
+$ helm uninstall traefik-operator --namespace traefik --keep-history
 ```
-## Install and uninstall the Traefik operator with setup.sh
-Alternatively, you can run the helper script `setup.sh`, under the `kubernetes/samples/charts/util` folder, to install and uninstall Traefik.
+## Install and uninstall the Traefik operator with setupLoadBalancer.sh
+Alternatively, you can run the helper script `setupLoadBalancer.sh`, under the `kubernetes/samples/charts/util` folder, to install and uninstall Traefik.
 
 To install Traefik:
 ```
-$ ./setup.sh create traefik
+$ ./setupLoadBalancer.sh create traefik
 ```
 To uninstall Traefik:
 ```
-$ ./setup.sh delete traefik
+$ ./setupLoadBalancer.sh delete traefik
 ```

kubernetes/samples/charts/traefik/samples/host-routing.yaml

@@ -1,35 +1,34 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
+# Copyright (c) 2018, 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.
+
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
 metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
   name: traefik-hostrouting-1
-  namespace: default
+  namespace: weblogic-domain1
 spec:
-  rules:
-  - host: domain1.org
-    http:
-      paths:
-      - path:
-        backend:
-          serviceName: domain1-cluster-cluster-1
-          servicePort: 8001
-
+  routes:
+  - kind: Rule
+    match: Host(`domain1.org`)
+    services:
+    - kind: Service
+      name: domain1-cluster-cluster-1
+      port: 8001
 ---
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
 metadata:
   annotations:
     kubernetes.io/ingress.class: traefik
   name: traefik-hostrouting-2
-  namespace: test1
+  namespace: weblogic-domain2
 spec:
-  rules:
-  - host: domain2.org
-    http:
-      paths:
-      - path:
-        backend:
-          serviceName: domain2-cluster-cluster-1
-          servicePort: 8001
-
+  routes:
+  - kind: Rule
+    match: Host(`domain2.org`)
+    services:
+    - kind: Service
+      name: domain2-cluster-cluster-1
+      port: 8001