Skip to content

CFE-72: make infrastructure resource tags updatable #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Elbehery wants to merge 1 commit into from
Closed

CFE-72: make infrastructure resource tags updatable #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/operator/controller/ingress/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Copy link
Copy Markdown
Contributor

@lmzuccarelli lmzuccarelli Dec 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice simple change

return nil, err
}
return c, nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/operator/controller/ingress/load_balancer_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ var (
// local-with-fallback annotation for kube-proxy (see
// <https://bugzilla.redhat.com/show_bug.cgi?id=1960284>).
localWithFallbackAnnotation,
awsLBAdditionalResourceTags,
)

// Azure and GCP support switching between internal and external
Expand Down
7 changes: 7 additions & 0 deletions pkg/operator/controller/ingress/load_balancer_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down