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

feat(kuma-cp): allow using Dataplane kind in top level targetRef in all policies #12659

Merged
merged 14 commits into from
Jan 31, 2025
Merged

feat(kuma-cp): allow using Dataplane kind in top level targetRef in all policies #12659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
57ac2e6
feat(kuma-cp): allow using Dataplane kind in top level targetRef in a…
Automaat Jan 24, 2025
9e29103
feat(kuma-cp): code review
Automaat Jan 28, 2025
a4a0729
Merge remote-tracking branch 'origin/master' into feat/allow-using-da…
Automaat Jan 28, 2025
659ccde
chore(e2e): use descriptor for policy validation
Automaat Jan 28, 2025
4967a71
Merge remote-tracking branch 'origin/master' into feat/allow-using-da…
Automaat Jan 28, 2025
4e2e2cf
Merge remote-tracking branch 'origin/master' into feat/allow-using-da…
Automaat Jan 28, 2025
08eb3d8
chore(e2e): code review
Automaat Jan 28, 2025
1bbc414
chore(e2e): code review
Automaat Jan 29, 2025
d797db9
feat(kuma-cp): add tests
Automaat Jan 29, 2025
ec3d1fa
Merge remote-tracking branch 'origin/master' into feat/allow-using-da…
Automaat Jan 29, 2025
d15bd5a
feat(kuma-cp): fix e2e tests
Automaat Jan 30, 2025
b493c82
feat(kuma-cp): refactor
Automaat Jan 30, 2025
709886d
feat(kuma-cp): refactor
Automaat Jan 30, 2025
e8f1828
feat(kuma-cp): fix check
Automaat Jan 30, 2025
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
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshaccesslog/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ func validateTop(targetRef common_api.TargetRef) validators.ValidationError {
common_api.MeshGateway,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
IsInboundPolicy: true,
Automaat marked this conversation as resolved.
Show resolved Hide resolved
})
return targetRefErr
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshcircuitbreaker/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
common_api.MeshService,
common_api.MeshGateway,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
IsInboundPolicy: true,
})
return targetRefErr
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/plugins/policies/meshfaultinjection/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ func (r *MeshFaultInjectionResource) validateTop(targetRef *common_api.TargetRef
common_api.MeshGateway,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
IsInboundPolicy: true,
})
default:
return mesh.ValidateTargetRef(*targetRef, &mesh.ValidateTargetRefOpts{
Expand All @@ -42,7 +44,9 @@ func (r *MeshFaultInjectionResource) validateTop(targetRef *common_api.TargetRef
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
IsInboundPolicy: true,
})
}
}
Expand Down
1 change: 1 addition & 0 deletions pkg/plugins/policies/meshhealthcheck/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
common_api.MeshGateway,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshhttproute/api/v1alpha1/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func (r *MeshHTTPRouteResource) validateTop(targetRef *common_api.TargetRef) val
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand All @@ -48,6 +49,7 @@ func (r *MeshHTTPRouteResource) validateTop(targetRef *common_api.TargetRef) val
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
})
}
Expand Down
1 change: 1 addition & 0 deletions pkg/plugins/policies/meshloadbalancingstrategy/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
common_api.MeshGateway,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshmetric/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func (r *MeshMetricResource) validateTop(targetRef *common_api.TargetRef) valida
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.MeshGateway,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand All @@ -44,6 +45,7 @@ func (r *MeshMetricResource) validateTop(targetRef *common_api.TargetRef) valida
common_api.Mesh,
common_api.MeshSubset,
common_api.MeshService,
common_api.Dataplane,
common_api.MeshServiceSubset,
},
})
Expand Down
1 change: 1 addition & 0 deletions pkg/plugins/policies/meshpassthrough/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
SupportedKinds: []common_api.TargetRefKind{
common_api.Mesh,
common_api.MeshSubset,
common_api.Dataplane,
},
})
return targetRefErr
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshproxypatch/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func (r *MeshProxyPatchResource) validateTop(targetRef *common_api.TargetRef) va
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.MeshGateway,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: false,
})
Expand All @@ -52,6 +53,7 @@ func (r *MeshProxyPatchResource) validateTop(targetRef *common_api.TargetRef) va
SupportedKinds: []common_api.TargetRefKind{
common_api.Mesh,
common_api.MeshSubset,
common_api.Dataplane,
common_api.MeshService,
common_api.MeshServiceSubset,
},
Expand Down
4 changes: 4 additions & 0 deletions pkg/plugins/policies/meshratelimit/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ func (r *MeshRateLimitResource) validateTop(targetRef *common_api.TargetRef) val
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.MeshHTTPRoute,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
IsInboundPolicy: true,
})
default:
return mesh.ValidateTargetRef(*targetRef, &mesh.ValidateTargetRefOpts{
Expand All @@ -45,7 +47,9 @@ func (r *MeshRateLimitResource) validateTop(targetRef *common_api.TargetRef) val
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
IsInboundPolicy: true,
})
}
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshretry/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func (r *MeshRetryResource) validateTop(targetRef *common_api.TargetRef) validat
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.MeshHTTPRoute,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand All @@ -48,6 +49,7 @@ func (r *MeshRetryResource) validateTop(targetRef *common_api.TargetRef) validat
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
})
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshtcproute/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func (r *MeshTCPRouteResource) validateTop(targetRef *common_api.TargetRef) vali
common_api.MeshGateway,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
GatewayListenerTagsAllowed: true,
})
Expand All @@ -43,6 +44,7 @@ func (r *MeshTCPRouteResource) validateTop(targetRef *common_api.TargetRef) vali
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
})
}
Expand Down
1 change: 1 addition & 0 deletions pkg/plugins/policies/meshtls/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
SupportedKinds: []common_api.TargetRefKind{
common_api.Mesh,
common_api.MeshSubset,
common_api.Dataplane,
Automaat marked this conversation as resolved.
Show resolved Hide resolved
},
})
return targetRefErr
Expand Down
2 changes: 2 additions & 0 deletions pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ func validateTop(targetRef *common_api.TargetRef) validators.ValidationError {
common_api.MeshSubset,
common_api.MeshService,
common_api.MeshServiceSubset,
common_api.Dataplane,
},
IsInboundPolicy: true,
})
return targetRefErr
}
Expand Down
Loading