Skip to content

Commit 7a6f78a

Browse files
davem-gitdavem-git
authored
Merge branch 'main' into feat-tcp-security-policy-gateway-api
2 parents a989171 + c68db79 commit 7a6f78a

22 files changed

+141
-67
lines changed

‎api/v1alpha1/healthcheck_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ type PassiveHealthCheck struct {
5252

5353
// ConsecutiveGatewayErrors sets the number of consecutive gateway errors triggering ejection.
5454
//
55-
// +kubebuilder:default=0
5655
// +optional
5756
ConsecutiveGatewayErrors *uint32 `json:"consecutiveGatewayErrors,omitempty"`
5857

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ spec:
526526
format: int32
527527
type: integer
528528
consecutiveGatewayErrors:
529-
default: 0
530529
description: ConsecutiveGatewayErrors sets the number of consecutive
531530
gateway errors triggering ejection.
532531
format: int32

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,6 @@ spec:
594594
format: int32
595595
type: integer
596596
consecutiveGatewayErrors:
597-
default: 0
598597
description: ConsecutiveGatewayErrors sets the number
599598
of consecutive gateway errors triggering ejection.
600599
format: int32

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11559,7 +11559,6 @@ spec:
1155911559
format: int32
1156011560
type: integer
1156111561
consecutiveGatewayErrors:
11562-
default: 0
1156311562
description: ConsecutiveGatewayErrors
1156411563
sets the number of consecutive
1156511564
gateway errors triggering ejection.
@@ -12690,7 +12689,6 @@ spec:
1269012689
format: int32
1269112690
type: integer
1269212691
consecutiveGatewayErrors:
12693-
default: 0
1269412692
description: ConsecutiveGatewayErrors
1269512693
sets the number of consecutive
1269612694
gateway errors triggering ejection.
@@ -13917,7 +13915,6 @@ spec:
1391713915
format: int32
1391813916
type: integer
1391913917
consecutiveGatewayErrors:
13920-
default: 0
1392113918
description: ConsecutiveGatewayErrors
1392213919
sets the number of consecutive gateway
1392313920
errors triggering ejection.
@@ -15051,7 +15048,6 @@ spec:
1505115048
format: int32
1505215049
type: integer
1505315050
consecutiveGatewayErrors:
15054-
default: 0
1505515051
description: ConsecutiveGatewayErrors sets
1505615052
the number of consecutive gateway errors
1505715053
triggering ejection.

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_securitypolicies.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,6 @@ spec:
11101110
format: int32
11111111
type: integer
11121112
consecutiveGatewayErrors:
1113-
default: 0
11141113
description: ConsecutiveGatewayErrors sets the
11151114
number of consecutive gateway errors triggering
11161115
ejection.
@@ -2135,7 +2134,6 @@ spec:
21352134
format: int32
21362135
type: integer
21372136
consecutiveGatewayErrors:
2138-
default: 0
21392137
description: ConsecutiveGatewayErrors sets the
21402138
number of consecutive gateway errors triggering
21412139
ejection.
@@ -3371,7 +3369,6 @@ spec:
33713369
format: int32
33723370
type: integer
33733371
consecutiveGatewayErrors:
3374-
default: 0
33753372
description: ConsecutiveGatewayErrors sets
33763373
the number of consecutive gateway errors
33773374
triggering ejection.
@@ -4664,7 +4661,6 @@ spec:
46644661
format: int32
46654662
type: integer
46664663
consecutiveGatewayErrors:
4667-
default: 0
46684664
description: ConsecutiveGatewayErrors sets the
46694665
number of consecutive gateway errors triggering
46704666
ejection.

‎charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backendtrafficpolicies.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ spec:
525525
format: int32
526526
type: integer
527527
consecutiveGatewayErrors:
528-
default: 0
529528
description: ConsecutiveGatewayErrors sets the number of consecutive
530529
gateway errors triggering ejection.
531530
format: int32

‎charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyextensionpolicies.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,6 @@ spec:
593593
format: int32
594594
type: integer
595595
consecutiveGatewayErrors:
596-
default: 0
597596
description: ConsecutiveGatewayErrors sets the number
598597
of consecutive gateway errors triggering ejection.
599598
format: int32

‎charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11558,7 +11558,6 @@ spec:
1155811558
format: int32
1155911559
type: integer
1156011560
consecutiveGatewayErrors:
11561-
default: 0
1156211561
description: ConsecutiveGatewayErrors
1156311562
sets the number of consecutive
1156411563
gateway errors triggering ejection.
@@ -12689,7 +12688,6 @@ spec:
1268912688
format: int32
1269012689
type: integer
1269112690
consecutiveGatewayErrors:
12692-
default: 0
1269312691
description: ConsecutiveGatewayErrors
1269412692
sets the number of consecutive
1269512693
gateway errors triggering ejection.
@@ -13916,7 +13914,6 @@ spec:
1391613914
format: int32
1391713915
type: integer
1391813916
consecutiveGatewayErrors:
13919-
default: 0
1392013917
description: ConsecutiveGatewayErrors
1392113918
sets the number of consecutive gateway
1392213919
errors triggering ejection.
@@ -15050,7 +15047,6 @@ spec:
1505015047
format: int32
1505115048
type: integer
1505215049
consecutiveGatewayErrors:
15053-
default: 0
1505415050
description: ConsecutiveGatewayErrors sets
1505515051
the number of consecutive gateway errors
1505615052
triggering ejection.

‎charts/gateway-helm/crds/generated/gateway.envoyproxy.io_securitypolicies.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,6 @@ spec:
11091109
format: int32
11101110
type: integer
11111111
consecutiveGatewayErrors:
1112-
default: 0
11131112
description: ConsecutiveGatewayErrors sets the
11141113
number of consecutive gateway errors triggering
11151114
ejection.
@@ -2134,7 +2133,6 @@ spec:
21342133
format: int32
21352134
type: integer
21362135
consecutiveGatewayErrors:
2137-
default: 0
21382136
description: ConsecutiveGatewayErrors sets the
21392137
number of consecutive gateway errors triggering
21402138
ejection.
@@ -3370,7 +3368,6 @@ spec:
33703368
format: int32
33713369
type: integer
33723370
consecutiveGatewayErrors:
3373-
default: 0
33743371
description: ConsecutiveGatewayErrors sets
33753372
the number of consecutive gateway errors
33763373
triggering ejection.
@@ -4663,7 +4660,6 @@ spec:
46634660
format: int32
46644661
type: integer
46654662
consecutiveGatewayErrors:
4666-
default: 0
46674663
description: ConsecutiveGatewayErrors sets the
46684664
number of consecutive gateway errors triggering
46694665
ejection.

‎internal/provider/kubernetes/predicates.go‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,28 @@ func (r *gatewayAPIReconciler) validateSecretForReconcile(secret *corev1.Secret)
181181
}
182182
}
183183

184+
if !r.backendAPIDisabled() {
185+
if r.isBackendReferencingSecret(&nsName) {
186+
return true
187+
}
188+
}
189+
190+
return false
191+
}
192+
193+
func (r *gatewayAPIReconciler) isBackendReferencingSecret(nsName *types.NamespacedName) bool {
194+
backendList := &egv1a1.BackendList{}
195+
if err := r.client.List(context.Background(), backendList, &client.ListOptions{
196+
FieldSelector: fields.OneTermEqualSelector(secretBackendIndex, nsName.String()),
197+
}); err != nil {
198+
r.log.Error(err, "unable to find associated Backend")
199+
return false
200+
}
201+
202+
if len(backendList.Items) > 0 {
203+
return true
204+
}
205+
184206
return false
185207
}
186208

@@ -881,6 +903,20 @@ func (r *gatewayAPIReconciler) validateConfigMapForReconcile(obj client.Object)
881903
}
882904
}
883905

906+
if !r.backendAPIDisabled() {
907+
backendList := &egv1a1.BackendList{}
908+
if err := r.client.List(context.Background(), backendList, &client.ListOptions{
909+
FieldSelector: fields.OneTermEqualSelector(configMapBackendIndex, utils.NamespacedName(configMap).String()),
910+
}); err != nil {
911+
r.log.Error(err, "unable to find associated Backend")
912+
return false
913+
}
914+
915+
if len(backendList.Items) > 0 {
916+
return true
917+
}
918+
}
919+
884920
return false
885921
}
886922

0 commit comments

Comments
 (0)