Skip to content

Commit d2e2383

Browse files
committedNov 19, 2020
Rename port http to management in service
1 parent 7824d1e commit d2e2383

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed
 

‎controllers/rabbitmqcluster_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ var _ = Describe("RabbitmqClusterController", func() {
10671067
TargetPort: amqpTargetPort,
10681068
},
10691069
corev1.ServicePort{
1070-
Name: "http",
1070+
Name: "management",
10711071
Port: 15672,
10721072
Protocol: corev1.ProtocolTCP,
10731073
TargetPort: managementTargetPort,

‎internal/resource/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ func (builder *ServiceBuilder) updatePorts(servicePorts []corev1.ServicePort) []
117117
TargetPort: intstr.FromInt(5672),
118118
Name: "amqp",
119119
},
120-
"http": {
120+
"management": {
121121
Protocol: corev1.ProtocolTCP,
122122
Port: 15672,
123123
TargetPort: intstr.FromInt(15672),
124-
Name: "http",
124+
Name: "management",
125125
},
126126
}
127127
if builder.Instance.AdditionalPluginEnabled("rabbitmq_mqtt") {

‎internal/resource/service_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -393,13 +393,13 @@ var _ = Context("Services", func() {
393393
TargetPort: intstr.FromInt(5672),
394394
Protocol: corev1.ProtocolTCP,
395395
}
396-
httpPort := corev1.ServicePort{
397-
Name: "http",
396+
managementPort := corev1.ServicePort{
397+
Name: "management",
398398
Port: 15672,
399399
TargetPort: intstr.FromInt(15672),
400400
Protocol: corev1.ProtocolTCP,
401401
}
402-
Expect(svc.Spec.Ports).To(ConsistOf(amqpPort, httpPort))
402+
Expect(svc.Spec.Ports).To(ConsistOf(amqpPort, managementPort))
403403
})
404404

405405
DescribeTable("plugins exposing ports",
@@ -444,7 +444,7 @@ var _ = Context("Services", func() {
444444
{
445445
Protocol: corev1.ProtocolTCP,
446446
Port: 15672,
447-
Name: "http",
447+
Name: "management",
448448
TargetPort: intstr.FromInt(15672),
449449
NodePort: 1234,
450450
},
@@ -461,16 +461,16 @@ var _ = Context("Services", func() {
461461
TargetPort: intstr.FromInt(5672),
462462
NodePort: 12345,
463463
}
464-
expectedHTTPServicePort := corev1.ServicePort{
464+
expectedManagementServicePort := corev1.ServicePort{
465465
Protocol: corev1.ProtocolTCP,
466466
Port: 15672,
467-
Name: "http",
467+
Name: "management",
468468
TargetPort: intstr.FromInt(15672),
469469
NodePort: 1234,
470470
}
471471

472472
Expect(svc.Spec.Ports).To(ContainElement(expectedAmqpServicePort))
473-
Expect(svc.Spec.Ports).To(ContainElement(expectedHTTPServicePort))
473+
Expect(svc.Spec.Ports).To(ContainElement(expectedManagementServicePort))
474474
})
475475

476476
It("unsets nodePort after updating from NodePort to ClusterIP", func() {
@@ -614,7 +614,7 @@ var _ = Context("Services", func() {
614614
Protocol: corev1.ProtocolTCP,
615615
},
616616
corev1.ServicePort{
617-
Name: "http",
617+
Name: "management",
618618
Port: 15672,
619619
TargetPort: intstr.FromInt(15672),
620620
Protocol: corev1.ProtocolTCP,

‎system_tests/system_tests.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var _ = Describe("Operator", func() {
4949
waitForRabbitmqRunning(cluster)
5050

5151
hostname = kubernetesNodeIp(ctx, clientSet)
52-
port = rabbitmqNodePort(ctx, clientSet, cluster, "http")
52+
port = rabbitmqNodePort(ctx, clientSet, cluster, "management")
5353

5454
var err error
5555
username, password, err = getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
@@ -249,7 +249,7 @@ CONSOLE_LOG=new`
249249
waitForRabbitmqRunning(cluster)
250250

251251
hostname = kubernetesNodeIp(ctx, clientSet)
252-
port = rabbitmqNodePort(ctx, clientSet, cluster, "http")
252+
port = rabbitmqNodePort(ctx, clientSet, cluster, "management")
253253

254254
var err error
255255
username, password, err = getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
@@ -309,7 +309,7 @@ CONSOLE_LOG=new`
309309
It("works", func() {
310310
username, password, err := getUsernameAndPassword(ctx, clientSet, cluster.Namespace, cluster.Name)
311311
hostname := kubernetesNodeIp(ctx, clientSet)
312-
port := rabbitmqNodePort(ctx, clientSet, cluster, "http")
312+
port := rabbitmqNodePort(ctx, clientSet, cluster, "management")
313313
Expect(err).NotTo(HaveOccurred())
314314
assertHttpReady(hostname, port)
315315

0 commit comments

Comments
 (0)