Skip to content

Commit d9ab5f9

Browse files
committed
Remove unnecessary condition and agent feature
1 parent 270e0f5 commit d9ab5f9

File tree

2 files changed

+0
-33
lines changed

2 files changed

+0
-33
lines changed

internal/mode/static/provisioner/templates.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ allowed_directories:
4545
- /usr/share/nginx
4646
- /var/run/nginx
4747
features:
48-
- connection
4948
- configuration
5049
- certificates
5150
{{- if .EnableMetrics }}

internal/mode/static/state/conditions/conditions.go

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ const (
5353
// invalid. Used with ResolvedRefs (false).
5454
RouteReasonInvalidFilter v1.RouteConditionReason = "InvalidFilter"
5555

56-
// GatewayReasonGatewayConflict indicates there are multiple Gateway resources to choose from,
57-
// and we ignored the resource in question and picked another Gateway as the winner.
58-
// This reason is used with GatewayConditionAccepted (false).
59-
GatewayReasonGatewayConflict v1.GatewayConditionReason = "GatewayConflict"
60-
61-
// GatewayMessageGatewayConflict is a message that describes GatewayReasonGatewayConflict.
62-
GatewayMessageGatewayConflict = "The resource is ignored due to a conflicting Gateway resource"
63-
6456
// GatewayReasonUnsupportedValue is used with GatewayConditionAccepted (false) when a value of a field in a Gateway
6557
// is invalid or not supported.
6658
GatewayReasonUnsupportedValue v1.GatewayConditionReason = "UnsupportedValue"
@@ -574,19 +566,6 @@ func NewGatewayAccepted() conditions.Condition {
574566
}
575567
}
576568

577-
// NewGatewayConflict returns Conditions that indicate the Gateway has a conflict with another Gateway.
578-
func NewGatewayConflict() []conditions.Condition {
579-
return []conditions.Condition{
580-
{
581-
Type: string(v1.GatewayConditionAccepted),
582-
Status: metav1.ConditionFalse,
583-
Reason: string(GatewayReasonGatewayConflict),
584-
Message: GatewayMessageGatewayConflict,
585-
},
586-
NewGatewayConflictNotProgrammed(),
587-
}
588-
}
589-
590569
// NewGatewayAcceptedListenersNotValid returns a Condition that indicates the Gateway is accepted,
591570
// but has at least one listener that is invalid.
592571
func NewGatewayAcceptedListenersNotValid() conditions.Condition {
@@ -668,17 +647,6 @@ func NewGatewayNotProgrammedInvalid(msg string) conditions.Condition {
668647
}
669648
}
670649

671-
// NewGatewayConflictNotProgrammed returns a custom Programmed Condition that indicates the Gateway has a
672-
// conflict with another Gateway.
673-
func NewGatewayConflictNotProgrammed() conditions.Condition {
674-
return conditions.Condition{
675-
Type: string(v1.GatewayConditionProgrammed),
676-
Status: metav1.ConditionFalse,
677-
Reason: string(GatewayReasonGatewayConflict),
678-
Message: GatewayMessageGatewayConflict,
679-
}
680-
}
681-
682650
// NewNginxGatewayValid returns a Condition that indicates that the NginxGateway config is valid.
683651
func NewNginxGatewayValid() conditions.Condition {
684652
return conditions.Condition{

0 commit comments

Comments
 (0)