Skip to content

Commit eebd2ab

Browse files
committed
Add tests for prometheus TLS
1 parent d153a50 commit eebd2ab

File tree

4 files changed

+42
-8
lines changed

4 files changed

+42
-8
lines changed

internal/resource/configmap.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
4343
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
4444
management.ssl.port = 15671
4545
46-
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
46+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
4747
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
48-
prometheus.ssl.port = 15691
48+
prometheus.ssl.port = 15691
4949
`
5050
caCertPath = "/etc/rabbitmq-tls/ca.crt"
5151
tlsCertPath = "/etc/rabbitmq-tls/tls.crt"

internal/resource/configmap_test.go

+35-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,12 @@ listeners.ssl.default = 5671
251251
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
252252
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
253253
management.ssl.port = 15671
254-
management.tcp.port = 15672
254+
255+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
256+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
257+
prometheus.ssl.port = 15691
258+
management.tcp.port = 15672
259+
255260
`)
256261

257262
Expect(configMapBuilder.Update(configMap)).To(Succeed())
@@ -274,6 +279,11 @@ listeners.ssl.default = 5671
274279
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
275280
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
276281
management.ssl.port = 15671
282+
283+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
284+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
285+
prometheus.ssl.port = 15691
286+
277287
management.tcp.port = 15672
278288
279289
mqtt.listeners.ssl.default = 8883
@@ -301,6 +311,11 @@ listeners.ssl.default = 5671
301311
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
302312
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
303313
management.ssl.port = 15671
314+
315+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
316+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
317+
prometheus.ssl.port = 15691
318+
304319
management.tcp.port = 15672
305320
306321
ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
@@ -329,6 +344,11 @@ management.ssl.cacertfile = /etc/rabbitmq-tls/ca.crt
329344
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
330345
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
331346
management.ssl.port = 15671
347+
348+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
349+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
350+
prometheus.ssl.port = 15691
351+
332352
management.tcp.port = 15672
333353
334354
ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt
@@ -376,6 +396,10 @@ management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
376396
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
377397
management.ssl.port = 15671
378398
399+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
400+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
401+
prometheus.ssl.port = 15691
402+
379403
listeners.tcp = none
380404
`)
381405

@@ -410,6 +434,11 @@ listeners.ssl.default = 5671
410434
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
411435
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
412436
management.ssl.port = 15671
437+
438+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
439+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
440+
prometheus.ssl.port = 15691
441+
413442
listeners.tcp = none
414443
415444
mqtt.listeners.ssl.default = 8883
@@ -451,6 +480,11 @@ listeners.ssl.default = 5671
451480
management.ssl.certfile = /etc/rabbitmq-tls/tls.crt
452481
management.ssl.keyfile = /etc/rabbitmq-tls/tls.key
453482
management.ssl.port = 15671
483+
484+
prometheus.ssl.certfile = /etc/rabbitmq-tls/tls.crt
485+
prometheus.ssl.keyfile = /etc/rabbitmq-tls/tls.key
486+
prometheus.ssl.port = 15691
487+
454488
listeners.tcp = none
455489
456490
ssl_options.cacertfile = /etc/rabbitmq-tls/ca.crt

internal/resource/statefulset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ func (builder *StatefulSetBuilder) updateContainerPortsOnlyTLSListeners() []core
772772
ContainerPort: 15671,
773773
},
774774
{
775-
Name: "prometheus",
775+
Name: "prometheus-tls",
776776
ContainerPort: 15691,
777777
},
778778
}

internal/resource/statefulset_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ var _ = Describe("StatefulSet", func() {
706706
ContainerPort: 4369,
707707
},
708708
{
709-
Name: "prometheus",
710-
ContainerPort: 15692,
709+
Name: "prometheus-tls",
710+
ContainerPort: 15691,
711711
},
712712
{
713713
Name: "amqps",
@@ -731,8 +731,8 @@ var _ = Describe("StatefulSet", func() {
731731
ContainerPort: 4369,
732732
},
733733
{
734-
Name: "prometheus",
735-
ContainerPort: 15692,
734+
Name: "prometheus-tls",
735+
ContainerPort: 15691,
736736
},
737737
{
738738
Name: "amqps",

0 commit comments

Comments
 (0)