Skip to content
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

fix typo in the patch #625

Merged
merged 2 commits into from
Jul 11, 2024
Merged

fix typo in the patch #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3495ef5
fix typo in the patch
spacewander Jul 3, 2024
38e6e48
more
spacewander Jul 5, 2024
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
4 changes: 2 additions & 2 deletions controller/internal/controller/filterpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ func (r *FilterPolicyReconciler) resolveWithVirtualService(ctx context.Context,
// For reducing the write to K8S API server and reconciliation,
// we don't add `gateway.networking.k8s.io/PolicyAffected` to the affected resource.
// If people want to check whether the VirtualService/HTTPRoute is affected, they can
// check whether there is an EnvoyFilter named `httn-h-$host` (the `$host` is one of the resources' hosts).
// check whether there is an EnvoyFilter named `htnn-h-$host` (the `$host` is one of the resources' hosts).
// For wildcard host, the `*.` is converted to `-`. For example, `*.example.com` results in
// EnvoyFilter name `htnn-h--example.com`, and `www.example.com` results in `httn-h-www.example.com`.
// EnvoyFilter name `htnn-h--example.com`, and `www.example.com` results in `htnn-h-www.example.com`.
} else {
policy.SetAccepted(gwapiv1a2.PolicyReasonTargetNotFound, "all gateways are not found or unsupported")
}
Expand Down
6 changes: 3 additions & 3 deletions patch/istio/1.21/20240410-embed-htnn-controller-go-code.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ index 0000000..75de3a5
+ return warnings, err
+ })
+
+func validateHTTNAnntation(cfg *config.Config, gk schema.GroupKind) error {
+func validateHTNNAnnotation(cfg *config.Config, gk schema.GroupKind) error {
+ if cfg.Annotations == nil {
+ return nil
+ }
Expand Down Expand Up @@ -1203,7 +1203,7 @@ index db201a3..c976633 100644
name := cfg.Name

+ if features.EnableHTNN {
+ err := validateHTTNAnntation(&cfg, schema.GroupKind{Group: "networking.istio.io", Kind: "Gateway"})
+ err := validateHTNNAnnotation(&cfg, schema.GroupKind{Group: "networking.istio.io", Kind: "Gateway"})
+ if err != nil {
+ return nil, err
+ }
Expand All @@ -1218,7 +1218,7 @@ index db201a3..c976633 100644
}
+
+ if features.EnableHTNN {
+ err := validateHTTNAnntation(&cfg, schema.GroupKind{Group: "networking.istio.io", Kind: "VirtualService"})
+ err := validateHTNNAnnotation(&cfg, schema.GroupKind{Group: "networking.istio.io", Kind: "VirtualService"})
+ if err != nil {
+ return nil, err
+ }
Expand Down