Skip to content

Commit cf3bb45

Browse files
authoredJan 8, 2021
Fix merging of pod annotations (#547)
Before this commit, existing pod annotations took precedence over updated annotations (e.g. prometheus port). This commit fixes issue 2 in #533 (review)
1 parent cb25f3b commit cf3bb45

File tree

4 files changed

+21
-172
lines changed

4 files changed

+21
-172
lines changed
 

‎go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ module github.com/rabbitmq/cluster-operator
33
go 1.15
44

55
require (
6-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
76
github.com/cloudflare/cfssl v1.5.0
87
github.com/eclipse/paho.mqtt.golang v1.3.1
98
github.com/go-delve/delve v1.5.1
109
github.com/go-logr/logr v0.3.0
1110
github.com/go-stomp/stomp v2.1.0+incompatible
12-
github.com/gophercloud/gophercloud v0.5.0 // indirect
1311
github.com/michaelklishin/rabbit-hole/v2 v2.6.0
1412
github.com/onsi/ginkgo v1.14.2
1513
github.com/onsi/gomega v1.10.4

0 commit comments

Comments
 (0)