Skip to content

Commit ae85420

Browse files
Feature/expose domains (#433)
Disallow lists for domain definition.
1 parent 1d1d9c1 commit ae85420

File tree

4 files changed

+9
-23
lines changed

4 files changed

+9
-23
lines changed

charts/drupal/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: drupal
3-
version: 0.3.113
3+
version: 0.3.114
44
dependencies:
55
- name: mariadb
66
version: 7.5.x

charts/drupal/test.values.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# This file includes the configuration used to validate the chart with a dry-run installation.
22

33
exposeDomains:
4-
- hostname: example.com
5-
- hostname: www.example.com
6-
ssl:
7-
enabled: true
8-
issuer: letsencrypt-staging
4+
example:
5+
hostname: example.com
6+
example2:
7+
hostname: www.example.com
8+
ssl:
9+
enabled: true
10+
issuer: letsencrypt-staging
911

1012
domainPrefixes: ['en', 'fi']
1113

charts/drupal/tests/drupal_ingress_test.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -243,22 +243,6 @@ tests:
243243
path: 'spec.rules[0].host'
244244
value: 'bar.baz'
245245

246-
- it: exposeDomains as list, multiple hostnames can use the same ingress [list definition to be deprecated]
247-
template: drupal-ingress.yaml
248-
set:
249-
exposeDomains:
250-
- hostname: foo.baz
251-
- hostname: bar.baz
252-
asserts:
253-
- documentIndex: 1
254-
equal:
255-
path: 'spec.rules[0].host'
256-
value: 'foo.baz'
257-
- documentIndex: 1
258-
equal:
259-
path: 'spec.rules[1].host'
260-
value: 'bar.baz'
261-
262246
- it: exposeDomains - can supply staticIpAddressName for gce type ingress
263247
template: drupal-ingress.yaml
264248
set:

charts/drupal/values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"enabled": { "type": "boolean" }
6363
}
6464
},
65-
"exposeDomains": { "type": ["array","object"], "items": { "type": "object"}},
65+
"exposeDomains": { "type": "object", "items": { "type": "object"}},
6666
"exposeDomainsDefaults": { "type": "object"},
6767
"domainPrefixes": { "type": "array", "items": { "type": "string"}},
6868
"ssl": { "type": "object" },

0 commit comments

Comments
 (0)