@@ -2,11 +2,13 @@ package elbv2
22
33import (
44 "context"
5+ awssdk "github.com/aws/aws-sdk-go/aws"
56 "github.com/go-logr/logr"
67 "github.com/pkg/errors"
78 corev1 "k8s.io/api/core/v1"
9+ "k8s.io/apimachinery/pkg/api/equality"
810 apierrors "k8s.io/apimachinery/pkg/api/errors"
9- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1012 "k8s.io/apimachinery/pkg/util/wait"
1113 elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
1214 "sigs.k8s.io/aws-load-balancer-controller/pkg/deploy/tracking"
@@ -17,6 +19,8 @@ import (
1719)
1820
1921const (
22+ defaultWaitTGBObservedPollInterval = 200 * time .Millisecond
23+ defaultWaitTGBObservedTimeout = 60 * time .Second
2024 defaultWaitTGBDeletionPollInterval = 200 * time .Millisecond
2125 defaultWaitTGBDeletionTimeout = 60 * time .Second
2226)
@@ -37,78 +41,81 @@ func NewDefaultTargetGroupBindingManager(k8sClient client.Client, trackingProvid
3741 trackingProvider : trackingProvider ,
3842 logger : logger ,
3943
44+ waitTGBObservedPollInterval : defaultWaitTGBObservedPollInterval ,
45+ waitTGBObservedTimout : defaultWaitTGBObservedTimeout ,
4046 waitTGBDeletionPollInterval : defaultWaitTGBDeletionPollInterval ,
4147 waitTGBDeletionTimeout : defaultWaitTGBDeletionTimeout ,
4248 }
4349}
4450
4551var _ TargetGroupBindingManager = & defaultTargetGroupBindingManager {}
4652
53+ // default implementation for TargetGroupBindingManager.
4754type defaultTargetGroupBindingManager struct {
4855 k8sClient client.Client
4956 trackingProvider tracking.Provider
5057 logger logr.Logger
5158
59+ waitTGBObservedPollInterval time.Duration
60+ waitTGBObservedTimout time.Duration
5261 waitTGBDeletionPollInterval time.Duration
5362 waitTGBDeletionTimeout time.Duration
5463}
5564
5665func (m * defaultTargetGroupBindingManager ) Create (ctx context.Context , resTGB * elbv2model.TargetGroupBindingResource ) (elbv2model.TargetGroupBindingResourceStatus , error ) {
57- tgARN , err := resTGB . Spec . Template . Spec . TargetGroupARN . Resolve (ctx )
66+ k8sTGBSpec , err := buildK8sTargetGroupBindingSpec (ctx , resTGB )
5867 if err != nil {
5968 return elbv2model.TargetGroupBindingResourceStatus {}, err
6069 }
61- stackLabels := m .trackingProvider .StackLabels (resTGB .Stack ())
62- k8sTGBSpec := elbv2api.TargetGroupBindingSpec {
63- TargetGroupARN : tgARN ,
64- TargetType : resTGB .Spec .Template .Spec .TargetType ,
65- ServiceRef : resTGB .Spec .Template .Spec .ServiceRef ,
66- }
67- if resTGB .Spec .Template .Spec .Networking != nil {
68- k8sTGBNetworking , err := buildK8sTargetGroupBindingNetworking (ctx , * resTGB .Spec .Template .Spec .Networking )
69- if err != nil {
70- return elbv2model.TargetGroupBindingResourceStatus {}, err
71- }
72- k8sTGBSpec .Networking = & k8sTGBNetworking
73- }
7470
71+ stackLabels := m .trackingProvider .StackLabels (resTGB .Stack ())
7572 k8sTGB := & elbv2api.TargetGroupBinding {
76- ObjectMeta : v1 .ObjectMeta {
73+ ObjectMeta : metav1 .ObjectMeta {
7774 Namespace : resTGB .Spec .Template .Namespace ,
7875 Name : resTGB .Spec .Template .Name ,
7976 Labels : stackLabels ,
8077 },
8178 Spec : k8sTGBSpec ,
8279 }
80+
81+ m .logger .Info ("creating targetGroupBinding" ,
82+ "stackID" , resTGB .Stack ().StackID (),
83+ "resourceID" , resTGB .ID ())
8384 if err := m .k8sClient .Create (ctx , k8sTGB ); err != nil {
8485 return elbv2model.TargetGroupBindingResourceStatus {}, err
8586 }
87+ m .logger .Info ("created targetGroupBinding" ,
88+ "stackID" , resTGB .Stack ().StackID (),
89+ "resourceID" , resTGB .ID (),
90+ "targetGroupBinding" , k8s .NamespacedName (k8sTGB ))
8691 return buildResTargetGroupBindingStatus (k8sTGB ), nil
8792}
8893
8994func (m * defaultTargetGroupBindingManager ) Update (ctx context.Context , resTGB * elbv2model.TargetGroupBindingResource , k8sTGB * elbv2api.TargetGroupBinding ) (elbv2model.TargetGroupBindingResourceStatus , error ) {
90- tgARN , err := resTGB . Spec . Template . Spec . TargetGroupARN . Resolve (ctx )
95+ k8sTGBSpec , err := buildK8sTargetGroupBindingSpec (ctx , resTGB )
9196 if err != nil {
9297 return elbv2model.TargetGroupBindingResourceStatus {}, err
9398 }
94- k8sTGBSpec := elbv2api.TargetGroupBindingSpec {
95- TargetGroupARN : tgARN ,
96- TargetType : resTGB .Spec .Template .Spec .TargetType ,
97- ServiceRef : resTGB .Spec .Template .Spec .ServiceRef ,
98- }
99- if resTGB .Spec .Template .Spec .Networking != nil {
100- k8sTGBNetworking , err := buildK8sTargetGroupBindingNetworking (ctx , * resTGB .Spec .Template .Spec .Networking )
101- if err != nil {
102- return elbv2model.TargetGroupBindingResourceStatus {}, err
103- }
104- k8sTGBSpec .Networking = & k8sTGBNetworking
99+ if equality .Semantic .DeepEqual (k8sTGB .Spec , k8sTGBSpec ) {
100+ return buildResTargetGroupBindingStatus (k8sTGB ), nil
105101 }
106102
107103 oldK8sTGB := k8sTGB .DeepCopy ()
108104 k8sTGB .Spec = k8sTGBSpec
105+ m .logger .Info ("modifying targetGroupBinding" ,
106+ "stackID" , resTGB .Stack ().StackID (),
107+ "resourceID" , resTGB .ID (),
108+ "targetGroupBinding" , k8s .NamespacedName (k8sTGB ))
109109 if err := m .k8sClient .Patch (ctx , k8sTGB , client .MergeFrom (oldK8sTGB )); err != nil {
110110 return elbv2model.TargetGroupBindingResourceStatus {}, err
111111 }
112+ if err := m .waitUntilTargetGroupBindingObserved (ctx , k8sTGB ); err != nil {
113+ return elbv2model.TargetGroupBindingResourceStatus {}, err
114+ }
115+ m .logger .Info ("modified targetGroupBinding" ,
116+ "stackID" , resTGB .Stack ().StackID (),
117+ "resourceID" , resTGB .ID (),
118+ "targetGroupBinding" , k8s .NamespacedName (k8sTGB ))
112119 return buildResTargetGroupBindingStatus (k8sTGB ), nil
113120}
114121
@@ -126,6 +133,23 @@ func (m *defaultTargetGroupBindingManager) Delete(ctx context.Context, tgb *elbv
126133 return nil
127134}
128135
136+ func (m * defaultTargetGroupBindingManager ) waitUntilTargetGroupBindingObserved (ctx context.Context , tgb * elbv2api.TargetGroupBinding ) error {
137+ ctx , cancel := context .WithTimeout (ctx , m .waitTGBObservedTimout )
138+ defer cancel ()
139+
140+ observedTGB := & elbv2api.TargetGroupBinding {}
141+ return wait .PollImmediateUntil (m .waitTGBObservedPollInterval , func () (bool , error ) {
142+ if err := m .k8sClient .Get (ctx , k8s .NamespacedName (tgb ), observedTGB ); err != nil {
143+ return false , err
144+ }
145+ if awssdk .Int64Value (observedTGB .Status .ObservedGeneration ) >= tgb .Generation {
146+ return true , nil
147+ }
148+
149+ return false , nil
150+ }, ctx .Done ())
151+ }
152+
129153func (m * defaultTargetGroupBindingManager ) waitUntilTargetGroupBindingDeleted (ctx context.Context , tgb * elbv2api.TargetGroupBinding ) error {
130154 ctx , cancel := context .WithTimeout (ctx , m .waitTGBDeletionTimeout )
131155 defer cancel ()
@@ -142,6 +166,28 @@ func (m *defaultTargetGroupBindingManager) waitUntilTargetGroupBindingDeleted(ct
142166 }, ctx .Done ())
143167}
144168
169+ func buildK8sTargetGroupBindingSpec (ctx context.Context , resTGB * elbv2model.TargetGroupBindingResource ) (elbv2api.TargetGroupBindingSpec , error ) {
170+ tgARN , err := resTGB .Spec .Template .Spec .TargetGroupARN .Resolve (ctx )
171+ if err != nil {
172+ return elbv2api.TargetGroupBindingSpec {}, err
173+ }
174+
175+ k8sTGBSpec := elbv2api.TargetGroupBindingSpec {
176+ TargetGroupARN : tgARN ,
177+ TargetType : resTGB .Spec .Template .Spec .TargetType ,
178+ ServiceRef : resTGB .Spec .Template .Spec .ServiceRef ,
179+ }
180+
181+ if resTGB .Spec .Template .Spec .Networking != nil {
182+ k8sTGBNetworking , err := buildK8sTargetGroupBindingNetworking (ctx , * resTGB .Spec .Template .Spec .Networking )
183+ if err != nil {
184+ return elbv2api.TargetGroupBindingSpec {}, err
185+ }
186+ k8sTGBSpec .Networking = & k8sTGBNetworking
187+ }
188+ return k8sTGBSpec , nil
189+ }
190+
145191func buildK8sTargetGroupBindingNetworking (ctx context.Context , resTGBNetworking elbv2model.TargetGroupBindingNetworking ) (elbv2api.TargetGroupBindingNetworking , error ) {
146192 k8sIngress := make ([]elbv2api.NetworkingIngressRule , 0 , len (resTGBNetworking .Ingress ))
147193 for _ , rule := range resTGBNetworking .Ingress {
0 commit comments