From 1270adc9fdba445b3a92d8a6d38df70db3014a4b Mon Sep 17 00:00:00 2001 From: elbehery Date: Mon, 13 Dec 2021 16:55:06 +0100 Subject: [PATCH] CFE-72: make infrastructure resource tags updatable --- pkg/operator/controller/ingress/controller.go | 3 +++ pkg/operator/controller/ingress/load_balancer_service.go | 1 + .../controller/ingress/load_balancer_service_test.go | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/pkg/operator/controller/ingress/controller.go b/pkg/operator/controller/ingress/controller.go index 2e95e9eae4..c0d1648449 100644 --- a/pkg/operator/controller/ingress/controller.go +++ b/pkg/operator/controller/ingress/controller.go @@ -105,6 +105,9 @@ func New(mgr manager.Manager, config Config) (controller.Controller, error) { if err := c.Watch(&source.Kind{Type: &configv1.Ingress{}}, handler.EnqueueRequestsFromMapFunc(reconciler.ingressConfigToIngressController)); err != nil { return nil, err } + if err := c.Watch(&source.Kind{Type: &configv1.Infrastructure{}}, handler.EnqueueRequestsFromMapFunc(reconciler.ingressConfigToIngressController)); err != nil { + return nil, err + } return c, nil } diff --git a/pkg/operator/controller/ingress/load_balancer_service.go b/pkg/operator/controller/ingress/load_balancer_service.go index 2c161c68d2..1df87be561 100644 --- a/pkg/operator/controller/ingress/load_balancer_service.go +++ b/pkg/operator/controller/ingress/load_balancer_service.go @@ -221,6 +221,7 @@ var ( // local-with-fallback annotation for kube-proxy (see // ). localWithFallbackAnnotation, + awsLBAdditionalResourceTags, ) // Azure and GCP support switching between internal and external diff --git a/pkg/operator/controller/ingress/load_balancer_service_test.go b/pkg/operator/controller/ingress/load_balancer_service_test.go index ce0b5cd189..787e695877 100644 --- a/pkg/operator/controller/ingress/load_balancer_service_test.go +++ b/pkg/operator/controller/ingress/load_balancer_service_test.go @@ -677,6 +677,13 @@ func TestLoadBalancerServiceChanged(t *testing.T) { }, expect: true, }, + { + description: "if the service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags changes", + mutate: func(svc *corev1.Service) { + svc.Annotations[awsLBAdditionalResourceTags] = "key=value" + }, + expect: true, + }, } for _, tc := range testCases {