chore(ingress): use ingress_class

Author: duanhongyi

charts/workflow/values.yaml

@@ -69,7 +69,11 @@ global:
   # - true: all RBAC-related manifests will be installed (in case your cluster supports RBAC)
   # - false: no RBAC-related manifests will be installed
   use_rbac: true
-
+  # Experimental feature to use Kubernetes ingress instead of Workflow's drycc-router.
+  # If ingress_class is empty, use drycc-router
+  # Otherwise, please check `kubernetes.io/ingress.class`
+  # The cert-manager component must be installed
+  ingress_class: ""
 
 s3:
   # Your AWS access key. Leave it empty if you want to use IAM credentials.
@@ -126,6 +130,13 @@ minio:
 # Values values are:
 # - Always
 # - IfNotPresent
+builder:
+  service:
+    # Service type default to ClusterIP, the entrance will be taken over by router.
+    type: ClusterIP
+    # If service.type is not set to NodePort, the following statement will be ignored.
+    nodePort: ""
+
 controller:
   app_pull_policy: "IfNotPresent"
   # Possible values are:
@@ -233,17 +244,6 @@ router:
       https: ""
       healthz: ""
 
-ingress:
-  # Experimental feature to use Kubernetes ingress instead of Workflow's drycc-router.
-  #
-  # Valid values are:
-  # - true: drycc-router will not be deployed. Workflow will not be usable until a Kubernetes ingress controller is installed.
-  # - false: drycc-router will be deployed (default).
-  enabled: false
-  # annotations:
-  #   kubernetes.io/ingress.class: nginx
-  #   kubernetes.io/tls-acme: 'true'
-
 workflow-manager:
   versions_api_url: https://versions.drycc.cc
   doctor_api_url: https://doctor.drycc.cc

mkdocs.yml

@@ -37,7 +37,7 @@ nav:
     - Configuring Postgres: installing-workflow/configuring-postgres.md
     - Configuring the Registry: installing-workflow/configuring-registry.md
     - Chart Provenance: installing-workflow/chart-provenance.md
-    - Use Native Ingress: installing-workflow/use-native-ingress.md
+    - Use Kubernetes Ingress: installing-workflow/ingress.md
   - Users:
     - Command Line Interface: users/cli.md
     - Users and Registration: users/registration.md

src/installing-workflow/index.md

@@ -50,7 +50,7 @@ More rigorous installations would benefit from using outside sources for the fol
 
 #### (Experimental) Kubernetes Native Ingress
 
-Workflow now offers [experimental native ingress](use-native-ingress.md) to take advantage of native Kubernetes routing. Any compatible Kubernetes ingress controller can be used in place of Workflow's nginx-based drycc-router. Follow [this guide](use-native-ingress.md) to enable experimental native ingress.
+Workflow now offers [experimental native ingress](ingress.md) to take advantage of native Kubernetes routing. Any compatible Kubernetes ingress controller can be used in place of Workflow's nginx-based drycc-router. Follow [this guide](ingress.md) to enable experimental native ingress.
 
 ## Add the Drycc Chart Repository
 

src/installing-workflow/ingress.md

@@ -5,9 +5,23 @@
 Now that Helm is installed and the repository has been added, install Workflow with a native ingress by running:
 
 ```
-$ helm install drycc/workflow --namespace drycc --set ingress.enabled=true,controller.platform_domain=drycc.cc
+$ helm install drycc/workflow --namespace drycc \
+    --set global.ingress_class=nginx \
+    --set controller.platform_domain=drycc.cc \
+    --set builder.service.type=LoadBalancer
 ```
 
+Of course, if you deploy it on a bare machine, you probably don't have Load Balancer. You need to use NodePort:
+```
+$ helm install drycc/workflow --namespace drycc \
+    --set global.ingress_class=nginx \
+    --set controller.platform_domain=drycc.cc \
+    --set builder.service.type=NodePort \
+    --set builder.service.nodePort=32222
+``` 
+
+If you want to use Load Balancer on a bare machine, you can look at [metallb](https://github.com/danderson/metallb)
+
 Where `controller.platform_domain` is a **required** parameter that is traditionally not required for Workflow that is explained in the next section. In this example we are using `drycc.cc` for `$hostname`.
 
 Helm will install a variety of Kubernetes resources in the `drycc` namespace.
@@ -45,7 +59,7 @@ drycc-workflow-manager-68nu6   1/1       Running   0          5m
 
 ## Install a Kubernetes Ingress Controller
 
-Now that Workflow has been deployed with the `ingress.enable` flag set to `true`, we will need a Kubernetes ingress controller in place to begin routing traffic.
+Now that Workflow has been deployed with the `global.ingress_class` , we will need a Kubernetes ingress controller in place to begin routing traffic.
 
 Here is an example of how to use [traefik](https://traefik.io/) as an ingress controller for Workflow. Of course, you are welcome to use any controller you wish.