From e06fa3df4bd167134d14eb9c764303c94ddc39b9 Mon Sep 17 00:00:00 2001 From: Nick Young Date: Tue, 27 Feb 2024 06:02:51 +0000 Subject: [PATCH] Fold in changes from #2442 and fix yamllint errors Signed-off-by: Nick Young --- geps/gep-2648/index.md | 17 +++++++++++------ geps/gep-2648/metadata.yaml | 6 +++--- geps/gep-713/metadata.yaml | 12 ++++++------ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/geps/gep-2648/index.md b/geps/gep-2648/index.md index 7bb19e6e0b..5b146fa186 100644 --- a/geps/gep-2648/index.md +++ b/geps/gep-2648/index.md @@ -136,12 +136,17 @@ spec: sectionName: bar ``` -If a `sectionName` is specified, but does not exist on the targeted object, the Policy must fail to attach, -and the policy implementation should record a `resolvedRefs` or similar Condition in the Policy's status. - -When multiple Policies of the same type target the same object, one with a `sectionName` specified, and one without, -the one with a `sectionName` is more specific, and so will have all its settings apply. The less-specific Policy will -not attach to the target. +If a `sectionName` is specified, but does not exist on the targeted object, the +Policy must fail to attach, and the policy implementation should record a +`resolvedRefs` or similar Condition in the Policy's status. + +When multiple Policies of the same type target the same object, one with a +`sectionName` and one without, the more specific policy (i.e., the one with a +`sectionName`) will have its entire `spec` applied to the named section. +The less specific policy will also have its `spec` applied to the target but +MUST not affect the named section. The less specific policy will have its `spec` +applied to all other sections of the target that are not targeted by any other +more specific policies. ## Interactions with other Policy objects and settings diff --git a/geps/gep-2648/metadata.yaml b/geps/gep-2648/metadata.yaml index a1aa7489f1..e653ff229d 100644 --- a/geps/gep-2648/metadata.yaml +++ b/geps/gep-2648/metadata.yaml @@ -11,9 +11,9 @@ authors: - kflynn relationships: extends: - - name: Metaresources and Policy Attachment - number: 713 - description: Split out Direct Policy Attachment into its own GEP + - name: Metaresources and Policy Attachment + number: 713 + description: Split out Direct Policy Attachment into its own GEP # references is a list of hyperlinks to relevant external references. # It's intended to be used for storing Github discussions, Google docs, etc. references: {} diff --git a/geps/gep-713/metadata.yaml b/geps/gep-713/metadata.yaml index c3d3e686c9..d6b3a17aa5 100644 --- a/geps/gep-713/metadata.yaml +++ b/geps/gep-713/metadata.yaml @@ -8,12 +8,12 @@ authors: - kflynn relationships: extendedBy: - - name: Direct Policy Attachment - number: 2648 - description: Split out Direct Policy Attachment - - name: Inherited Policy Attachment - number: 2649 - description: Split out Inherited Policy Attachment + - name: Direct Policy Attachment + number: 2648 + description: Split out Direct Policy Attachment + - name: Inherited Policy Attachment + number: 2649 + description: Split out Inherited Policy Attachment references: - "https://github.com/kubernetes-sigs/gateway-api/issues/611" - "https://docs.google.com/document/d/13fyptUtO9NV_ZAgkoJlfukcBf2PVGhsKWG37yLkppJo/edit?resourcekey=0-Urhtj9gBkGBkSL1gHgbWKw"