Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit f5555fd

Browse files
chris-cronechris-crone
authored
Merge pull request #386 from mnottale/helm-revamp
Helm revamp
2 parents 00b2e92 + ad51e57 commit f5555fd

12 files changed

Lines changed: 535 additions & 349 deletions

File tree

‎e2e/testdata/helm-expected.chart/templates/stack.yaml‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,66 @@
1-
apiversion: v1beta2
2-
kind: stacks.compose.docker.com
1+
kind: Stack
2+
apiVersion: compose.docker.com/v1beta2
33
metadata:
4-
annotations: {}
5-
clustername: ""
6-
creationtimestamp: "0001-01-01T00:00:00Z"
7-
deletiongraceperiodseconds: null
8-
deletiontimestamp: null
9-
finalizers: []
10-
generatename: ""
11-
generation: 0
12-
initializers: null
13-
labels: {}
144
name: helm
5+
generatename: ""
156
namespace: ""
16-
ownerreferences: []
17-
resourceversion: ""
187
selflink: ""
198
uid: ""
9+
resourceversion: ""
10+
generation: 0
11+
creationtimestamp: "0001-01-01T00:00:00Z"
12+
deletiontimestamp: null
13+
deletiongraceperiodseconds: null
14+
labels: {}
15+
annotations: {}
16+
ownerreferences: []
17+
initializers: null
18+
finalizers: []
19+
clustername: ""
2020
spec:
2121
services:
22-
- image: '{{.Values.watcher.image}}'
23-
name: app-watcher
24-
- deploy:
22+
- name: app-watcher
23+
image: {{.Values.watcher.image}}
24+
- name: debug
25+
deploy:
2526
resources:
2627
limits:
27-
memory: '{{.Values.memory}}'
28+
memory: {{.Values.memory}}
29+
environment:
30+
foo: {{.Values.bar}}
2831
health_check:
29-
interval: 2m0s
3032
test:
3133
- /ping
3234
- debug
33-
timeout: '{{.Values.timeout}}'
35+
timeout: {{.Values.timeout}}
36+
interval: 2m0s
3437
image: busybox:latest
35-
name: debug
38+
labels:
39+
foo: {{.Values.bar}}
3640
ports:
3741
- mode: ingress
42+
target: {{.Values.aport}}
3843
protocol: tcp
39-
target: '{{.Values.aport}}'
4044
- mode: ingress
45+
target: {{.Values.sport}}
46+
published: {{.Values.dport}}
4147
protocol: tcp
42-
published: '{{.Values.dport}}'
43-
target: '{{.Values.sport}}'
44-
privileged: '{{.Values.privileged}}'
45-
read_only: '{{.Values.read_only}}'
46-
stdin_open: '{{.Values.stdin_open}}'
47-
tty: '{{.Values.tty}}'
48-
- deploy:
49-
replicas: '{{.Values.myapp.nginx_replicas}}'
48+
privileged: {{.Values.privileged}}
49+
read_only: {{.Values.read_only}}
50+
stdin_open: {{.Values.stdin_open}}
51+
tty: {{.Values.tty}}
52+
- name: front
53+
deploy:
54+
replicas: {{.Values.myapp.nginx_replicas}}
55+
environment:
56+
{{.Values.foo}}: {{.Values.bar}}
5057
image: nginx:{{.Values.myapp.nginx_version}}
51-
name: front
52-
- command:
58+
labels:
59+
{{.Values.foo}}: {{.Values.bar}}
60+
- name: monitor
61+
command:
5362
- monitor
5463
- --source
5564
- '{{.Values.app.name}}-{{.Values.app.version}}'
5665
- $dollar
5766
image: busybox:latest
58-
name: monitor

‎e2e/testdata/helm-expected.chart/templates/stackv1beta1.yaml‎

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
objectmeta:
2-
annotations: {}
3-
clustername: ""
4-
creationtimestamp: "0001-01-01T00:00:00Z"
5-
deletiongraceperiodseconds: null
6-
deletiontimestamp: null
7-
finalizers: []
8-
generatename: ""
9-
generation: 0
10-
initializers: null
11-
labels: {}
1+
kind: Stack
2+
apiVersion: compose.docker.com/v1beta1
3+
metadata:
124
name: helm
5+
generatename: ""
136
namespace: ""
14-
ownerreferences: []
15-
resourceversion: ""
167
selflink: ""
178
uid: ""
9+
resourceversion: ""
10+
generation: 0
11+
creationtimestamp: "0001-01-01T00:00:00Z"
12+
deletiontimestamp: null
13+
deletiongraceperiodseconds: null
14+
labels: {}
15+
annotations: {}
16+
ownerreferences: []
17+
initializers: null
18+
finalizers: []
19+
clustername: ""
1820
spec:
19-
composefile: |
21+
composeFile: |
2022
version: "3.7"
2123
services:
2224
app-watcher:
@@ -25,51 +27,42 @@ spec:
2527
deploy:
2628
resources:
2729
limits:
28-
memory:
29-
valuetemplate: {{.Values.memory}}
30+
memory: {{.Values.memory}}
31+
environment:
32+
foo: {{.Values.bar}}
3033
healthcheck:
3134
test:
3235
- /ping
3336
- debug
34-
timeout:
35-
valuetemplate: {{.Values.timeout}}
36-
interval:
37-
value: 2m0s
37+
timeout: {{.Values.timeout}}
38+
interval: 2m0s
3839
image: busybox:latest
40+
labels:
41+
foo: {{.Values.bar}}
3942
ports:
4043
- mode: ingress
41-
target:
42-
valuetemplate: {{.Values.aport}}
44+
target: {{.Values.aport}}
4345
protocol: tcp
4446
- mode: ingress
45-
target:
46-
valuetemplate: {{.Values.sport}}
47-
published:
48-
valuetemplate: {{.Values.dport}}
47+
target: {{.Values.sport}}
48+
published: {{.Values.dport}}
4949
protocol: tcp
50-
template_privileged:
51-
valuetemplate: {{.Values.privileged}}
52-
read_only:
53-
valuetemplate: {{.Values.read_only}}
54-
stdin_open:
55-
valuetemplate: {{.Values.stdin_open}}
56-
tty:
57-
valuetemplate: {{.Values.tty}}
50+
privileged: {{.Values.privileged}}
51+
read_only: {{.Values.read_only}}
52+
stdin_open: {{.Values.stdin_open}}
53+
tty: {{.Values.tty}}
5854
front:
5955
deploy:
60-
replicas:
61-
valuetemplate: {{.Values.myapp.nginx_replicas}}
56+
replicas: {{.Values.myapp.nginx_replicas}}
57+
environment:
58+
{{.Values.foo}}: {{.Values.bar}}
6259
image: nginx:{{.Values.myapp.nginx_version}}
60+
labels:
61+
{{.Values.foo}}: {{.Values.bar}}
6362
monitor:
6463
command:
6564
- monitor
6665
- --source
67-
- {{.Values.app.name}}-{{.Values.app.version}}
66+
- '{{.Values.app.name}}-{{.Values.app.version}}'
6867
- $dollar
6968
image: busybox:latest
70-
status:
71-
message: ""
72-
phase: ""
73-
typemeta:
74-
apiversion: v1beta1
75-
kind: stacks.compose.docker.com

‎e2e/testdata/helm-expected.chart/templates/stackv1beta2.yaml‎

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,66 @@
1-
apiversion: v1beta2
2-
kind: stacks.compose.docker.com
1+
kind: Stack
2+
apiVersion: compose.docker.com/v1beta2
33
metadata:
4-
annotations: {}
5-
clustername: ""
6-
creationtimestamp: "0001-01-01T00:00:00Z"
7-
deletiongraceperiodseconds: null
8-
deletiontimestamp: null
9-
finalizers: []
10-
generatename: ""
11-
generation: 0
12-
initializers: null
13-
labels: {}
144
name: helm
5+
generatename: ""
156
namespace: ""
16-
ownerreferences: []
17-
resourceversion: ""
187
selflink: ""
198
uid: ""
9+
resourceversion: ""
10+
generation: 0
11+
creationtimestamp: "0001-01-01T00:00:00Z"
12+
deletiontimestamp: null
13+
deletiongraceperiodseconds: null
14+
labels: {}
15+
annotations: {}
16+
ownerreferences: []
17+
initializers: null
18+
finalizers: []
19+
clustername: ""
2020
spec:
2121
services:
22-
- image: '{{.Values.watcher.image}}'
23-
name: app-watcher
24-
- deploy:
22+
- name: app-watcher
23+
image: {{.Values.watcher.image}}
24+
- name: debug
25+
deploy:
2526
resources:
2627
limits:
27-
memory: '{{.Values.memory}}'
28+
memory: {{.Values.memory}}
29+
environment:
30+
foo: {{.Values.bar}}
2831
health_check:
29-
interval: 2m0s
3032
test:
3133
- /ping
3234
- debug
33-
timeout: '{{.Values.timeout}}'
35+
timeout: {{.Values.timeout}}
36+
interval: 2m0s
3437
image: busybox:latest
35-
name: debug
38+
labels:
39+
foo: {{.Values.bar}}
3640
ports:
3741
- mode: ingress
42+
target: {{.Values.aport}}
3843
protocol: tcp
39-
target: '{{.Values.aport}}'
4044
- mode: ingress
45+
target: {{.Values.sport}}
46+
published: {{.Values.dport}}
4147
protocol: tcp
42-
published: '{{.Values.dport}}'
43-
target: '{{.Values.sport}}'
44-
privileged: '{{.Values.privileged}}'
45-
read_only: '{{.Values.read_only}}'
46-
stdin_open: '{{.Values.stdin_open}}'
47-
tty: '{{.Values.tty}}'
48-
- deploy:
49-
replicas: '{{.Values.myapp.nginx_replicas}}'
48+
privileged: {{.Values.privileged}}
49+
read_only: {{.Values.read_only}}
50+
stdin_open: {{.Values.stdin_open}}
51+
tty: {{.Values.tty}}
52+
- name: front
53+
deploy:
54+
replicas: {{.Values.myapp.nginx_replicas}}
55+
environment:
56+
{{.Values.foo}}: {{.Values.bar}}
5057
image: nginx:{{.Values.myapp.nginx_version}}
51-
name: front
52-
- command:
58+
labels:
59+
{{.Values.foo}}: {{.Values.bar}}
60+
- name: monitor
61+
command:
5362
- monitor
5463
- --source
5564
- '{{.Values.app.name}}-{{.Values.app.version}}'
5665
- $dollar
5766
image: busybox:latest
58-
name: monitor

‎e2e/testdata/helm-expected.chart/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ aport: 10000
22
app:
33
name: myapp
44
version: 0.1.0
5+
bar: barvalue
56
dport: 12000
7+
foo: foovalue
68
memory: "100000000"
79
myapp:
810
debug: false

‎e2e/testdata/helm.dockerapp/docker-compose.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ services:
44
image: nginx:${myapp.nginx_version}
55
deploy:
66
replicas: ${myapp.nginx_replicas}
7+
labels:
8+
- $foo=$bar
9+
environment:
10+
- $foo=$bar
711
debug:
812
image: busybox:latest
913
ports:
1014
- $aport
1115
- $sport:$dport
16+
labels:
17+
foo: $bar
18+
environment:
19+
foo: $bar
1220
privileged: ${privileged}
1321
read_only: $read_only
1422
tty: $tty

‎e2e/testdata/helm.dockerapp/settings.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ sport: 11000
1313
dport: 12000
1414
memory: '100000000'
1515
timeout: 10s
16+
bar: barvalue
17+
foo: foovalue

0 commit comments

Comments
 (0)