Fold in changes from #2442 and fix yamllint errors

Signed-off-by: Nick Young <[email protected]>
kubernetes-sigs · Feb 27, 2024 · e06fa3d · e06fa3d
1 parent 16d8b9d
commit e06fa3d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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"