Skip to content

Commit eb1c025

Browse files
krisnovamboersma
authored andcommitted
feat(ingress): Support enable/disable conditions in Workflow chart
A few semantic changes, and supporting enabled/disable in requirements.yaml Non breaking change.
1 parent 17cddde commit eb1c025

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

charts/workflow/requirements.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ dependencies:
4545
version: <registry-token-refresher-tag>
4646
repository: https://charts.deis.com/registry-token-refresher
4747
- name: router
48+
condition: !global.experimental_native_engress
4849
version: <router-tag>
4950
repository: https://charts.deis.com/router
5051
- name: workflow-manager

charts/workflow/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ global:
5151
host_port: 5555
5252
# Prefix for the imagepull secret created when using private registry
5353
secret_prefix: "private-registry"
54-
# The public resolvable hostname to build your cluster with.
55-
#
56-
# This will be the hostname that is used to build endpoints such as "deis.$HOSTNAME"
57-
hostname: ""
5854
# Experimental feature to toggle using kubernetes ingress instead of the Deis router.
5955
#
6056
# Valid values are:
@@ -117,7 +113,11 @@ controller:
117113
# disabled - turns off open registration
118114
# admin_only - allows for registration by an admin only.
119115
registration_mode: "admin_only"
120-
116+
# The public resolvable hostname to build your cluster with.
117+
#
118+
# This will be the hostname that is used to build endpoints such as "deis.$HOSTNAME"
119+
platform_domain: ""
120+
121121
database:
122122
# The username and password to be used by the on-cluster database.
123123
# If left empty they will be generated using randAlphaNum

src/quickstart/deploy-an-app.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ port that routes to port 80 on the controller.
1717

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

20-
**$hostname**: 1.1.1.1.nip.io
21-
2220
#### Option 2: Experimental Native Ingress Installation
2321

2422
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`.

0 commit comments

Comments
 (0)