Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into chshi-OWLS-70886-svc-upt2

Author: chunshi-ora

kubernetes/samples/charts/ingress-per-domain/README.md

@@ -13,7 +13,9 @@ To install the chart with the release name, `my-ingress`, with the given `values
 ```
 # Change directory to the cloned git weblogic-kubernetes-operator repo.
 $ cd kubernetes/samples/charts
-$ helm install ingress-per-domain --name my-ingress --values values.yaml
+
+# Use helm to install the chart.  Use `--namespace` to specify the name of the WebLogic domain's namespace.
+$ helm install ingress-per-domain --name my-ingress --namespace my-domain-namespace --values values.yaml
 ```
 The Ingress resource will be created in the same namespace as the WebLogic domain cluster.
 
@@ -23,10 +25,9 @@ type: TRAEFIK
 
 # WLS domain as backend to the load balancer
 wlsDomain:
-  namespace: default
   domainUID: domain1
   clusterName: cluster1
-  svcPort: 8001
+  managedServerPort: 8001
 
 # Traefik specific values
 traefik:
@@ -40,10 +41,9 @@ type: VOYAGER
 
 # WLS domain as backend to the load balancer
 wlsDomain:
-  namespace: default
   domainUID: domain1
   clusterName: cluster1  
-  svcPort: 8001
+  managedServerPort: 8001
 
 # Voyager specific values
 voyager:
@@ -60,15 +60,14 @@ $ helm delete --purge my-ingress
 ## Configuration
 The following table lists the configurable parameters of this chart and their default values.
 
-| Parameter                              | Description                                                                                                                  | Default                                           |
-| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
-| `type`                     | Type of Ingress controller. Legal values are `TRAEFIK` or `VOYAGER`.                                                                                            | `TRAEFIK` |
-| `wlsDomain.namespace`                     | Namespace of the WLS domain cluster.                                                                                            | `default` |
-| `wlsDomain.domainUID`                     | DomainUID of the WLS domain.                                                                                            | `domain1` |
-| `wlsDomain.clusterName`                     | Cluster name in the WLS domain.                                                                                            | `cluster-1` |
-| `wlsDomain.svcPort`                     | Service port of the WLS domain cluster.                                                                                            | `8001` |
-| `traefik.hostname`                     | Hostname to route to the WLS domain cluster.                                                                                            | `domain1.org` |
-| `voyager.webPort`                     | Web port to access the Voyager load balancer.                                                                                         | `30305` |
-| `voyager.statsPort`                     | Port to access the Voyager/HAProxy stats page.                                                                                            | `30315` |
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `type` | Type of Ingress controller. Legal values are `TRAEFIK` or `VOYAGER`. | `TRAEFIK` |
+| `wlsDomain.domainUID` | DomainUID of the WLS domain. | `domain1` |
+| `wlsDomain.clusterName` | Cluster name in the WLS domain. | `cluster-1` |
+| `wlsDomain.managedServerPort` | Port number of the managed servers in the WLS domain cluster. | `8001` |
+| `traefik.hostname` | Hostname to route to the WLS domain cluster. | `domain1.org` |
+| `voyager.webPort` | Web port to access the Voyager load balancer. | `30305` |
+| `voyager.statsPort` | Port to access the Voyager/HAProxy stats page. | `30315` |
 
 **Note:** The input values `domainUID` and `clusterName` will be used to generate the Kubernetes `serviceName` of the WLS cluster with the format `domainUID-cluster-clusterName`.

kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml

@@ -1,13 +1,15 @@
-# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 {{- if eq .Values.type "TRAEFIK" }}
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}-traefik
-  namespace: {{ .Values.wlsDomain.namespace }}
+  name: {{ .Values.wlsDomain.domainUID }}-traefik
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
 spec:
   annotations:
     kubernetes.io/ingress.class: traefik
@@ -18,5 +20,5 @@ spec:
       - path:
         backend:
           serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}'
-          servicePort: {{ .Values.wlsDomain.svcPort }}
+          servicePort: {{ .Values.wlsDomain.managedServerPort }}
 {{- end }}

kubernetes/samples/charts/ingress-per-domain/templates/voyager-ingress.yaml

@@ -1,13 +1,15 @@
-# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 {{- if eq .Values.type "VOYAGER" }}
 ---
 apiVersion: voyager.appscode.com/v1beta1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}-voyager
-  namespace: {{ .Values.wlsDomain.namespace }}
+  name: {{ .Values.wlsDomain.domainUID }}-voyager
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
   annotations:
     ingress.appscode.com/type: 'NodePort'
     ingress.appscode.com/stats: 'true'
@@ -20,14 +22,16 @@ spec:
       paths:
       - backend:
           serviceName: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}'
-          servicePort: '{{ .Values.wlsDomain.svcPort }}'
+          servicePort: '{{ .Values.wlsDomain.managedServerPort }}'
 
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-voyager-stats
-  namespace: {{ .Values.wlsDomain.namespace }}
+  name: {{ .Values.wlsDomain.domainUID }}-voyager-stats
+  namespace: {{ .Release.Namespace }}
+  labels:
+    weblogic.resourceVersion: domain-v2
 spec:
   type: NodePort
   ports:
@@ -38,5 +42,5 @@ spec:
       nodePort: {{ .Values.voyager.statsPort }}
   selector:
     origin: voyager
-    origin-name: {{ .Release.Name }}-voyager
+    origin-name: {{ .Values.wlsDomain.domainUID }}-voyager
 {{- end }}

kubernetes/samples/charts/ingress-per-domain/values.yaml

@@ -1,4 +1,4 @@
-# Copyright 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 # Default values for ingress-per-domain.
@@ -10,10 +10,9 @@ type: TRAEFIK
 
 # WLS domain as backend to the load balancer
 wlsDomain:
-  namespace: default
   domainUID: domain1
   clusterName: cluster-1
-  svcPort: 8001
+  managedServerPort: 8001
 
 # Traefik specific values
 traefik:

kubernetes/samples/charts/traefik/README.md

@@ -3,10 +3,6 @@
 This sample demonstrates how to install the Traefik ingress controller to provide 
 load balancing for WebLogic clusters.
 
-## Prerequisites
-
-To use this sample you must download [onessl](https://github.com/kubepack/onessl) and place it in the `util` directory.
-
 ## 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.

kubernetes/samples/charts/traefik/values.yaml

@@ -1,3 +1,5 @@
+image: traefik
+imageTag: 1.7.4
 serviceType: NodePort
 service:
   nodePorts:

kubernetes/samples/charts/util/setup.sh

@@ -25,7 +25,6 @@ function createVoyager() {
     helm install appscode/voyager --name voyager-operator --version 7.4.0 \
       --namespace voyager \
       --set cloudProvider=baremetal \
-      --set apiserver.ca="$(${MYDIR}/onessl get kube-ca)" \
       --set apiserver.enableValidatingWebhook=false
   else
     echo "Voyager operator is already installed."

kubernetes/samples/charts/voyager/README.md

@@ -5,30 +5,20 @@ AppsCode has provided a Helm chart to install Voyager. See the official installa
 
 As a demonstration, the following are the detailed steps to install the Voyager operator by using a Helm chart on a Linux OS.
 
-### 1. Install Onessl
-Onessl is a utility provided by AppsCode. We'll use it to get a CA certificate for the Kubernetes cluster.
-```
-# The assumption is that you have added ~/bin to your PATH env.
-$ curl -fsSL -o onessl https://github.com/kubepack/onessl/releases/download/0.3.0/onessl-linux-amd64 \
-  && chmod +x onessl \
-  && mv onessl ~/bin
-```
-
-### 2. Add the AppsCode chart repository
+### 1. Add the AppsCode chart repository
 ```
 $ helm repo add appscode https://charts.appscode.com/stable/
 $ helm repo update
 $ helm search appscode/voyager
 ```
 
-### 3. Install the Voyager operator
+### 2. Install the Voyager operator
 ```
 # Kubernetes 1.9.x - 1.10.x
 $ kubectl create ns voyager
 $ helm install appscode/voyager --name voyager-operator --version 7.4.0 \
   --namespace voyager \
   --set cloudProvider=baremetal \
-  --set apiserver.ca="$(onessl get kube-ca)" \
   --set apiserver.enableValidatingWebhook=false
 ```
 ## Optionally, download the Voyager Helm chart

site/quickstart.md

@@ -40,7 +40,7 @@ $ docker tag oracle/weblogic-kubernetes-operator:2.0-rc2 weblogic-kubernetes-ope
 ```
 d.	Pull the Traefik load balancer image:
 ```
-$ docker pull traefik:latest
+$ docker pull traefik:1.7.4
 ```
 e.	Pull the WebLogic 12.2.1.3 install image:
 ```
@@ -205,34 +205,36 @@ $ kubectl get services -n sample-domain1-ns
 ```
 
 d.	Create an Ingress for the domain, in the domain namespace, by using the [sample](../kubernetes/samples/charts/ingress-per-domain/README.md) Helm chart:
-* Use `helm install`, specifying the `domainUID` (`sample-domain1`) and domain namespace (`sample-domain1-ns`) in the `values.yaml` file.
 ```
 $ helm install kubernetes/samples/charts/ingress-per-domain \
   --name sample-domain1-ingress \
-  --set wlsDomain.namespace=sample-domain1-ns \
+  --namespace sample-domain1-ns \
   --set wlsDomain.domainUID=sample-domain1 \
   --set traefik.hostname=sample-domain1.org
 ```
 
 e.	To confirm that the load balancer noticed the new Ingress and is successfully routing to the domain's server pods,
     you can hit the URL for the "WebLogic Ready App" which will return a HTTP 200 status code, as
     shown in the example below.  If you used the host-based routing Ingress sample, you will need to
-    provide the hostname in the `-H` option:
+    provide the hostname in the `-H` option.
+
+**NOTE**: Be sure to include the trailing forward slash on the URL, otherwise the command won't work.
+
 ```
-$ curl -v -H 'host: sample-domain1.org' http://your.server.com:30305/weblogic/

-*
About to connect() to your.server.com port 30305 (#0)

-*   Trying 10.196.1.64...

+$ curl -v -H 'host: sample-domain1.org' http://your.server.com:30305/weblogic/
+* About to connect() to your.server.com port 30305 (#0)
+*   Trying 10.196.1.64...
 * Connected to your.server.com (10.196.1.64) port 30305 (#0)
-
> GET /weblogic/ HTTP/1.1

-> User-Agent: curl/7.29.0

-> Accept: */*

-> host: domain1.org

+ > GET /weblogic/ HTTP/1.1
+> User-Agent: curl/7.29.0
+> Accept: */*
+> host: domain1.org
 >
-
< HTTP/1.1 200 OK

-< Content-Length: 0

+ < HTTP/1.1 200 OK
+< Content-Length: 0
 < Date: Thu, 20 Dec 2018 14:52:22 GMT
-
< Vary: Accept-Encoding

-<
* Connection #0 to host your.server.com left intact

+ < Vary: Accept-Encoding
+< * Connection #0 to host your.server.com left intact
 ```
 **Note**: Depending on where your Kubernetes cluster is running, you may need to open firewall ports or
 update security lists to allow ingress to this port.