Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into sai/merged-sets
Browse files Browse the repository at this point in the history
  • Loading branch information
saiskee committed Mar 18, 2024
2 parents 53ba10f + aaa4fae commit 1884e63
Show file tree
Hide file tree
Showing 6 changed files with 304 additions and 68 deletions.
22 changes: 18 additions & 4 deletions api/core/v1/core.proto
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,28 @@ message ObjectSelector {
}
}

// TargetRef identifies Gateway API objects to apply a direct policy to.
// PolicyTargetReference identifies Gateway API objects to directly apply policy to.
// This is a copy of the upstream K8s Gateway API `targetRef` API.
// See the following for more information:
// * https://gateway-api.sigs.k8s.io/geps/gep-713/
// * https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io%2fv1alpha2.PolicyTargetReference
// * https://github.com/kubernetes-sigs/gateway-api/blob/b4f0307cc9269e73187300e72979e7e111ab74ab/apis/v1alpha2/policy_types.go#L34-L56
message PolicyTargetReference {
string group = 1;
string kind = 2;
string name = 3;

// Optional, if unspecified, the local namespace of the policy is inferred.
google.protobuf.StringValue namespace = 4;
}

// PolicyTargetReferenceWithSectionName identifies Gateway API objects, and optionally a specific section of those objects, to directly apply policy to.
// This is a copy of the upstream K8s Gateway API `targetRef` API.
// Note that we are only using the upstream `PolicyTargetReferenceWithSectionName` type as currently our policies will distinguish between sections.
// See the following for more information:
// * https://gateway-api.sigs.k8s.io/geps/gep-713/
// * https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io%2fv1alpha2.PolicyTargetReferenceWithSectionName
// * https://github.com/kubernetes-sigs/gateway-api/blob/444631bfe06f3bcca5d0eadf1857eac1d369421d/apis/v1alpha2/policy_types.go#L58-L83
message TargetRefWithSectionName {
// * https://github.com/kubernetes-sigs/gateway-api/blob/b4f0307cc9269e73187300e72979e7e111ab74ab/apis/v1alpha2/policy_types.go#L58-L83
message PolicyTargetReferenceWithSectionName {
string group = 1;
string kind = 2;
string name = 3;
Expand Down
4 changes: 4 additions & 0 deletions changelog/v0.36.5/add-target-ref.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changelog:
- type: NEW_FEATURE
issueLink: https://github.com/solo-io/skv2/issues/529
description: rename TargetRefWithSectionName, add PolicyTargetReference
29 changes: 26 additions & 3 deletions pkg/api/core.skv2.solo.io/v1/core.pb.clone.go

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

52 changes: 49 additions & 3 deletions pkg/api/core.skv2.solo.io/v1/core.pb.equal.go

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

Loading

0 comments on commit 1884e63

Please sign in to comment.