dry-stack 0.0.39 → 0.0.41
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dry-stack/stack.rb +23 -22
- data/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ba3e8a1af6b73dab3938541b4e57ff3b4cd8a9cc745ce3a0376c218189b637c0
|
4
|
+
data.tar.gz: c99d06063a7c31100aa58b7a8b1dc1bbabf5543aa45da1ed4e50a5b9d16c33ff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 465baf756681438604e591107265a16b5f456ba8c92adfeec256d32abc8e8d162a23c658c0be1449b9b2b2f1f42f7d2f8603cdbc15ce6911a46c61afa63ae6ed
|
7
|
+
data.tar.gz: 3b20f234381bf01bbcd95f7e65762473439074fee9665bc34443dff4b7e71d1c7df960187436070e18f02c6bccd84ee7c744ccc4f868ce4407a29a350dc01186
|
data/lib/dry-stack/stack.rb
CHANGED
@@ -93,7 +93,6 @@ module Dry
|
|
93
93
|
|
94
94
|
compose[:services].each do |name, service|
|
95
95
|
ingress = [@ingress[name]].flatten
|
96
|
-
ingress[0][:port] ||= service[:ports]&.first if ingress[0]
|
97
96
|
service[:deploy] ||= {}
|
98
97
|
service[:deploy][:labels] ||= []
|
99
98
|
service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
|
@@ -112,38 +111,40 @@ module Dry
|
|
112
111
|
end
|
113
112
|
|
114
113
|
if ingress[0] && opts[:ingress]
|
114
|
+
ingress[0][:port] ||= service[:ports]&.first
|
115
115
|
service[:deploy][:labels] = ingress[0]&.map { |k, v| "ingress.#{k}=#{v}" }
|
116
116
|
end
|
117
117
|
|
118
118
|
service_name = "#{@name}_#{name}"
|
119
119
|
|
120
120
|
if ingress[0] && (opts[:traefik] || opts[:traefik_tls])
|
121
|
-
service[:deploy][:labels]
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
]
|
126
|
-
|
127
|
-
if opts[:traefik_tls]
|
128
|
-
domain = opts[:tls_domain] || 'example.com'
|
129
|
-
domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
|
130
|
-
domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
|
121
|
+
service[:deploy][:labels] << 'traefik.enable=true'
|
122
|
+
|
123
|
+
ingress.each_with_index do |ing, index|
|
124
|
+
ing[:port] ||= service[:ports]&.first
|
131
125
|
service[:deploy][:labels] += [
|
132
|
-
"traefik.http.routers.#{service_name}.
|
133
|
-
"traefik.http.
|
134
|
-
"traefik.http.routers.#{service_name}.tls.domains[0].main=#{domain}"
|
126
|
+
"traefik.http.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
|
127
|
+
"traefik.http.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}"
|
135
128
|
]
|
136
|
-
end
|
137
129
|
|
138
|
-
|
130
|
+
if opts[:traefik_tls]
|
131
|
+
domain = opts[:tls_domain] || 'example.com'
|
132
|
+
domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
|
133
|
+
domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
|
134
|
+
service[:deploy][:labels] += [
|
135
|
+
"traefik.http.routers.#{service_name}-#{index}.tls=true",
|
136
|
+
"traefik.http.routers.#{service_name}-#{index}.tls.certresolver=le",
|
137
|
+
"traefik.http.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}"
|
138
|
+
]
|
139
|
+
end
|
140
|
+
|
139
141
|
rule = []
|
140
|
-
rule << "HostRegexp(`{name:#{nginx_host2regexp
|
141
|
-
rule << "PathPrefix(`#{nginx_host2regexp
|
142
|
-
rule << "#{
|
143
|
-
|
142
|
+
rule << "HostRegexp(`{name:#{nginx_host2regexp ing[:host]}}`)" if ing[:host]
|
143
|
+
rule << "PathPrefix(`#{nginx_host2regexp ing[:path]}`)" if ing[:path]
|
144
|
+
rule << "#{ing[:rule]}" if ing[:rule]
|
145
|
+
|
146
|
+
service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
|
144
147
|
end
|
145
|
-
rule = rule_group.size > 1 ? rule_group.map{"(#{_1})"}.join(' || ') : rule_group[0]
|
146
|
-
service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule}"
|
147
148
|
end
|
148
149
|
|
149
150
|
hash = {'service-name': service_name}
|
data/lib/version.rb
CHANGED