Skip to content

Commit 95e1966

Browse files
author
Nick Barber
committed
Change annotation name
1 parent 641b07d commit 95e1966

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

controllers/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ var _ = BeforeSuite(func() {
191191
Name: "example-rabbit",
192192
Namespace: "default",
193193
Annotations: map[string]string{
194-
"rabbitmq.topology.allowed-namespaces": "allowed",
194+
"rabbitmq.com/topology-allowed-namespaces": "allowed",
195195
},
196196
},
197197
}
@@ -239,7 +239,7 @@ var _ = BeforeSuite(func() {
239239
Name: "allow-all-rabbit",
240240
Namespace: "default",
241241
Annotations: map[string]string{
242-
"rabbitmq.topology.allowed-namespaces": "*",
242+
"rabbitmq.com/topology-allowed-namespaces": "*",
243243
},
244244
},
245245
}

internal/cluster_reference.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
var (
1717
NoSuchRabbitmqClusterError = errors.New("RabbitmqCluster object does not exist")
18-
ResourceNotAllowedError = errors.New("Resource is not allowed to reference defined cluster reference. Check the namespace of the resource is allowed as part of the cluster's `rabbitmq.topology.allowed-namespaces` annotation")
18+
ResourceNotAllowedError = errors.New("Resource is not allowed to reference defined cluster reference. Check the namespace of the resource is allowed as part of the cluster's `rabbitmq.com/topology-allowed-namespaces` annotation")
1919
)
2020

2121
func ParseRabbitmqClusterReference(ctx context.Context, c client.Client, rmq topology.RabbitmqClusterReference, requestNamespace string) (*rabbitmqv1beta1.RabbitmqCluster, *corev1.Service, *corev1.Secret, error) {
@@ -32,7 +32,7 @@ func ParseRabbitmqClusterReference(ctx context.Context, c client.Client, rmq top
3232

3333
if rmq.Namespace != "" && rmq.Namespace != requestNamespace {
3434
var isAllowed bool
35-
if allowedNamespaces, ok := cluster.Annotations["rabbitmq.topology.allowed-namespaces"]; ok {
35+
if allowedNamespaces, ok := cluster.Annotations["rabbitmq.com/topology-allowed-namespaces"]; ok {
3636
for _, allowedNamespace := range strings.Split(allowedNamespaces, ",") {
3737
if requestNamespace == allowedNamespace || allowedNamespace == "*" {
3838
isAllowed = true

0 commit comments

Comments
 (0)