diff --git a/documentation/site/content/managing-domains/accessing-the-domain/ingress/_index.md b/documentation/site/content/managing-domains/accessing-the-domain/ingress/_index.md index fbde6e31591..79689a86a1d 100644 --- a/documentation/site/content/managing-domains/accessing-the-domain/ingress/_index.md +++ b/documentation/site/content/managing-domains/accessing-the-domain/ingress/_index.md @@ -54,9 +54,9 @@ additional pods become ready, or pods enter a non-ready state. Ingress resources contain routing rules to one or more backends. An ingress controller is responsible to apply the rules to the underlying load balancer. There are two approaches to create the Ingress resource: - * Use the Helm chart [ingress-per-domain](https://github.com/oracle/weblogic-kubernetes-operator/blob/{{< latestMinorVersion >}}/kubernetes/samples/charts/ingress-per-domain). + * Use the Helm chart. - Each ingress provider supports a number of annotations in Ingress resources. This Helm chart allows you to define the routing rules without dealing with the detailed provider-specific annotations. + Each ingress provider supports a number of annotations in Ingress resources. The Helm chart allows you to define the routing rules without dealing with the detailed provider-specific annotations. * Create the Ingress resource manually from a YAML file. diff --git a/documentation/site/content/samples/ingress/_index.md b/documentation/site/content/samples/ingress/_index.md index f858acf32ba..3d12fde11fa 100644 --- a/documentation/site/content/samples/ingress/_index.md +++ b/documentation/site/content/samples/ingress/_index.md @@ -16,4 +16,3 @@ The samples are located in following folders: * [Traefik](https://github.com/oracle/weblogic-kubernetes-operator/blob/{{< latestMinorVersion >}}/kubernetes/samples/charts/traefik/README.md) * [NGINX](https://github.com/oracle/weblogic-kubernetes-operator/blob/{{< latestMinorVersion >}}/kubernetes/samples/charts/nginx/README.md) -* [Ingress-per-domain](https://github.com/oracle/weblogic-kubernetes-operator/blob/{{< latestMinorVersion >}}/kubernetes/samples/charts/ingress-per-domain/README.md) diff --git a/kubernetes/samples/charts/ingress-per-domain/Chart.yaml b/kubernetes/samples/charts/ingress-per-domain/Chart.yaml deleted file mode 100644 index 60ff0fac2b5..00000000000 --- a/kubernetes/samples/charts/ingress-per-domain/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2018, 2021, Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. - -apiVersion: v1 -appVersion: "1.0" -description: A Helm chart to create an Ingress for a WLS domain. -name: ingress-per-domain -version: 0.1.0 diff --git a/kubernetes/samples/charts/ingress-per-domain/README.md b/kubernetes/samples/charts/ingress-per-domain/README.md deleted file mode 100644 index 02332cab937..00000000000 --- a/kubernetes/samples/charts/ingress-per-domain/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# An ingress per domain chart -This chart is for deploying an Ingress resource in front of a WebLogic domain cluster. We support ingress types: Traefik and NGINX. - -## Prerequisites -- Have Docker and a Kubernetes cluster running and have `kubectl` installed and configured. -- Have Helm installed. -- The corresponding ingress controller, Traefik or NGINX, is installed in the Kubernetes cluster. -- A WebLogic domain cluster deployed by `weblogic-operator` is running in the Kubernetes cluster. - -## Installing the chart - -To install the chart with the release name, `my-ingress`, with the given `values.yaml`: -```shell -# Change directory to the cloned git weblogic-kubernetes-operator repo. -$ cd kubernetes/samples/charts - -# 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. - -Sample `values.yaml` file for the Traefik Ingress: -```yaml -type: TRAEFIK - -# WLS domain as backend to the load balancer -wlsDomain: - domainUID: domain1 - clusterName: cluster1 - managedServerPort: 8001 - -# Traefik specific values -traefik: - # hostname used by host-routing - hostname: domain1.org -``` - -Sample `values.yaml` file for the NGINX Ingress: -```yaml -type: NGINX - -# WLS domain as backend to the load balancer -wlsDomain: - domainUID: domain1 - clusterName: cluster1 - managedServerPort: 8001 - -# NGINX specific values -nginx: - # hostname used by host-routing - hostname: domain1.org -``` - -## Uninstalling the chart -To uninstall and delete the `my-ingress` deployment: -```shell -$ helm uninstall 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 `NGINX`. | `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` | -| `nginx.hostname` | Hostname to route to the WLS domain cluster. | `domain1.org` | - -**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`. diff --git a/kubernetes/samples/charts/ingress-per-domain/templates/nginx-ingress.yaml b/kubernetes/samples/charts/ingress-per-domain/templates/nginx-ingress.yaml deleted file mode 100644 index 2de0f16a4aa..00000000000 --- a/kubernetes/samples/charts/ingress-per-domain/templates/nginx-ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2020, 2022, Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. - -{{- if eq .Values.type "NGINX" }} ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ .Values.wlsDomain.domainUID }}-nginx - namespace: {{ .Release.Namespace }} -spec: - ingressClassName: nginx - rules: - - host: '{{ .Values.nginx.hostname }}' - http: - paths: - - path: - pathType: ImplementationSpecific - backend: - service: - name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}' - port: - number: {{ .Values.wlsDomain.managedServerPort }} -{{- end }} diff --git a/kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml b/kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml deleted file mode 100644 index 4ea04b45979..00000000000 --- a/kubernetes/samples/charts/ingress-per-domain/templates/traefik-ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2018, 2022, Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. - -{{- if eq .Values.type "TRAEFIK" }} ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ .Values.wlsDomain.domainUID }}-traefik - namespace: {{ .Release.Namespace }} -spec: - ingressClassName: traefik - rules: - - host: '{{ .Values.traefik.hostname }}' - http: - paths: - - path: - pathType: ImplementationSpecific - backend: - service: - name: '{{ .Values.wlsDomain.domainUID }}-cluster-{{ .Values.wlsDomain.clusterName | lower | replace "_" "-" }}' - port: - number: {{ .Values.wlsDomain.managedServerPort }} -{{- end }} diff --git a/kubernetes/samples/charts/ingress-per-domain/values.yaml b/kubernetes/samples/charts/ingress-per-domain/values.yaml deleted file mode 100644 index 281c8582950..00000000000 --- a/kubernetes/samples/charts/ingress-per-domain/values.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2018, 2021, Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. - -# Default values for ingress-per-domain. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -# Load balancer type. Supported values are: TRAEFIK, NGINX -type: TRAEFIK - -# WLS domain as backend to the load balancer -wlsDomain: - domainUID: domain1 - clusterName: cluster-1 - managedServerPort: 8001 - -# Traefik specific values -traefik: - # hostname used by host-routing - hostname: domain1.org - - -# NGINX specific values -nginx: - # hostname used by host-routing - hostname: domain1.org