Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
feat(ingress): Support enable/disable conditions in Workflow chart
Browse files Browse the repository at this point in the history
A few semantic changes, and supporting enabled/disable in requirements.yaml

Non breaking change.
  • Loading branch information
krisnova authored and mboersma committed Mar 30, 2017
1 parent 17cddde commit eb1c025
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions charts/workflow/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies:
version: <registry-token-refresher-tag>
repository: https://charts.deis.com/registry-token-refresher
- name: router
condition: !global.experimental_native_engress
version: <router-tag>
repository: https://charts.deis.com/router
- name: workflow-manager
Expand Down
10 changes: 5 additions & 5 deletions charts/workflow/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ global:
host_port: 5555
# Prefix for the imagepull secret created when using private registry
secret_prefix: "private-registry"
# The public resolvable hostname to build your cluster with.
#
# This will be the hostname that is used to build endpoints such as "deis.$HOSTNAME"
hostname: ""
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
#
# Valid values are:
Expand Down Expand Up @@ -117,7 +113,11 @@ controller:
# disabled - turns off open registration
# admin_only - allows for registration by an admin only.
registration_mode: "admin_only"

# The public resolvable hostname to build your cluster with.
#
# This will be the hostname that is used to build endpoints such as "deis.$HOSTNAME"
platform_domain: ""

database:
# The username and password to be used by the on-cluster database.
# If left empty they will be generated using randAlphaNum
Expand Down
2 changes: 0 additions & 2 deletions src/quickstart/deploy-an-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ port that routes to port 80 on the controller.

Deis requires a wildcard DNS record to dynamically map app names to the router.

**$hostname**: 1.1.1.1.nip.io

#### Option 2: Experimental Native Ingress Installation

In this example, the user should already have DNS set up pointing to their known host. The `$hostname` value can be build by appending `deis.` to the value set in `global.exerpimental_native_ingress`.
Expand Down

0 comments on commit eb1c025

Please sign in to comment.