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.

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

feat: fsm cli support list Filter CRDs and filters #396

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1fe2b00
WIP: CLI filter command [skip ci]
reaver-flomesh Oct 21, 2024
b45cf74
WIP: CLI filter command [skip ci]
reaver-flomesh Oct 21, 2024
d4c22e7
Merge branch 'feature/cli-filters' of github-oss:flomesh-io/fsm into …
reaver-flomesh Oct 30, 2024
166da4d
fix: make manifests
reaver-flomesh Oct 30, 2024
b11d3f4
feat: add filter manager skeleton
reaver-flomesh Oct 30, 2024
889c4db
WIP: CLI filter command [skip ci]
reaver-flomesh Oct 21, 2024
4855299
fix: make manifests
reaver-flomesh Oct 30, 2024
019a579
feat: add filter manager skeleton
reaver-flomesh Oct 30, 2024
5076100
Merge branch 'feature/cli-filters' of github-oss:flomesh-io/fsm into …
reaver-flomesh Oct 31, 2024
1365010
wip: [skip ci] filter manager
reaver-flomesh Oct 31, 2024
4137fbf
refactor: remove RetryPolicy (#411)
reaver-flomesh Nov 1, 2024
f664b6c
build(deps): Bump github.com/hashicorp/vault from 1.18.0 to 1.18.1 (#…
reaver-flomesh Nov 2, 2024
81f479b
remove init container from connector deployment. (#415) (#416)
reaver-flomesh Nov 3, 2024
dce97c3
build(deps): Bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 (#…
dependabot[bot] Nov 5, 2024
f5b064f
[cherry-pick] feat: conditionally drop route rule if no available bac…
reaver-flomesh Nov 5, 2024
a172999
WIP: CLI filter command [skip ci]
reaver-flomesh Oct 21, 2024
845bdde
fix: make manifests
reaver-flomesh Oct 30, 2024
a88379b
feat: add filter manager skeleton
reaver-flomesh Oct 30, 2024
6fdbe4f
wip: [skip ci] filter manager
reaver-flomesh Oct 31, 2024
1b45d1c
Merge branch 'feature/cli-filters' of github-oss:flomesh-io/fsm into …
reaver-flomesh Nov 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
Prev Previous commit
Next Next commit
refactor: remove RetryPolicy (#411)
Signed-off-by: Lin Yang <[email protected]>
  • Loading branch information
reaver-flomesh authored Nov 1, 2024
commit 4137fbf7e69df092d2cf32bd68a1f1e9cf35db52
477 changes: 0 additions & 477 deletions cmd/fsm-bootstrap/crds/gateway.flomesh.io_retrypolicies.yaml

This file was deleted.

50 changes: 25 additions & 25 deletions codegen/gen-crd-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,32 +75,32 @@ function generate_client() {
"${ROOT_DIR}/pkg/apis"
}

echo "##### Generating config.flomesh.io client ######"
generate_client "config" "v1alpha1,v1alpha2,v1alpha3"

echo "##### Generating policy.flomesh.io client ######"
generate_client "policy" "v1alpha1"

echo "##### Generating networking.k8s.io client ######"
generate_client "networking" "v1"

echo "##### Generating multicluster.flomesh.io client ######"
generate_client "multicluster" "v1alpha1"

echo "##### Generating flomesh.io plugin client ######"
generate_client "plugin" "v1alpha1"

echo "##### Generating flomesh.io machine client ######"
generate_client "machine" "v1alpha1"

echo "##### Generating flomesh.io connector client ######"
generate_client "connector" "v1alpha1"

echo "##### Generating networking.flomesh.io client ######"
generate_client "namespacedingress" "v1alpha1"
#echo "##### Generating config.flomesh.io client ######"
#generate_client "config" "v1alpha1,v1alpha2,v1alpha3"
#
#echo "##### Generating policy.flomesh.io client ######"
#generate_client "policy" "v1alpha1"
#
#echo "##### Generating networking.k8s.io client ######"
#generate_client "networking" "v1"
#
#echo "##### Generating multicluster.flomesh.io client ######"
#generate_client "multicluster" "v1alpha1"
#
#echo "##### Generating flomesh.io plugin client ######"
#generate_client "plugin" "v1alpha1"
#
#echo "##### Generating flomesh.io machine client ######"
#generate_client "machine" "v1alpha1"
#
#echo "##### Generating flomesh.io connector client ######"
#generate_client "connector" "v1alpha1"
#
#echo "##### Generating networking.flomesh.io client ######"
#generate_client "namespacedingress" "v1alpha1"

echo "##### Generating gateway.flomesh.io PolicyAttachment client ######"
generate_client "policyattachment" "v1alpha1,v1alpha2"

echo "##### Generating extension.gateway.flomesh.io extension client ######"
generate_client "extension" "v1alpha1"
#echo "##### Generating extension.gateway.flomesh.io extension client ######"
#generate_client "extension" "v1alpha1"
11 changes: 0 additions & 11 deletions pkg/announcements/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -537,17 +537,6 @@ const (

// ---

// RetryPolicyAttachmentAdded is the type of announcement emitted when we observe an addition of retries.gateway.flomesh.io
RetryPolicyAttachmentAdded Kind = "retrypolicy-added"

// RetryPolicyAttachmentDeleted the type of announcement emitted when we observe a deletion of retries.gateway.flomesh.io
RetryPolicyAttachmentDeleted Kind = "retrypolicy-deleted"

// RetryPolicyAttachmentUpdated is the type of announcement emitted when we observe an update to retries.gateway.flomesh.io
RetryPolicyAttachmentUpdated Kind = "retrypolicy-updated"

// ---

// BackendTLSPolicyAdded is the type of announcement emitted when we observe an addition of backendtlspolicies.gateway.networking.k8s.io
BackendTLSPolicyAdded Kind = "backendtlspolicy-added"

Expand Down
94 changes: 0 additions & 94 deletions pkg/apis/policyattachment/v1alpha2/retry.go

This file was deleted.

148 changes: 0 additions & 148 deletions pkg/apis/policyattachment/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions pkg/apis/policyattachment/v1alpha2/zz_generated.register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions pkg/controllers/gateway/v1/httproute_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ func (r *httpRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
Watches(&gwv1alpha3.BackendTLSPolicy{}, handler.EnqueueRequestsFromMapFunc(r.backendTLSToHTTPRoutes)).
Watches(&gwpav1alpha2.BackendLBPolicy{}, handler.EnqueueRequestsFromMapFunc(r.backendLBToHTTPRoutes)).
Watches(&gwpav1alpha2.HealthCheckPolicy{}, handler.EnqueueRequestsFromMapFunc(r.healthCheckToHTTPRoutes)).
Watches(&gwpav1alpha2.RetryPolicy{}, handler.EnqueueRequestsFromMapFunc(r.retryToHTTPRoutes)).
Watches(&gwv1beta1.ReferenceGrant{}, handler.EnqueueRequestsFromMapFunc(r.referenceGrantToHTTPRoutes)).
Complete(r); err != nil {
return err
Expand Down Expand Up @@ -200,16 +199,6 @@ func (r *httpRouteReconciler) healthCheckToHTTPRoutes(ctx context.Context, objec
return r.policyToHTTPRoutes(ctx, policy, policy.Spec.TargetRefs)
}

func (r *httpRouteReconciler) retryToHTTPRoutes(ctx context.Context, object client.Object) []reconcile.Request {
policy, ok := object.(*gwpav1alpha2.HealthCheckPolicy)
if !ok {
log.Error().Msgf("Unexpected type %T", object)
return nil
}

return r.policyToHTTPRoutes(ctx, policy, policy.Spec.TargetRefs)
}

func (r *httpRouteReconciler) policyToHTTPRoutes(ctx context.Context, policy client.Object, targetRefs []gwv1alpha2.NamespacedPolicyTargetReference) []reconcile.Request {
var requests []reconcile.Request

Expand Down
Loading
Loading