From 440e1cadd24d92cea17019d152dc27fdf0a4e72c Mon Sep 17 00:00:00 2001
From: Alexander Zielenski <351783+alexzielenski@users.noreply.github.com>
Date: Mon, 29 Apr 2024 14:11:56 -0700
Subject: [PATCH] add marker comment support for annotating cluster scopedness

escape namespace keyword
---
 test/integration/pkg/generated/openapi_generated.go | 2 +-
 test/integration/testdata/golden.v2.json            | 3 ++-
 test/integration/testdata/golden.v3.json            | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/integration/pkg/generated/openapi_generated.go b/test/integration/pkg/generated/openapi_generated.go
index b4e37c470..9c24eba15 100644
--- a/test/integration/pkg/generated/openapi_generated.go
+++ b/test/integration/pkg/generated/openapi_generated.go
@@ -1092,7 +1092,7 @@ func schema_test_integration_testdata_valuevalidation_Foo(ref common.ReferenceCa
 			},
 			VendorExtensible: spec.VendorExtensible{
 				Extensions: spec.Extensions{
-					"x-kubernetes-validations": []interface{}{map[string]interface{}{"message": "foo", "rule": "self == oldSelf"}, map[string]interface{}{"reason": "FieldValueRequired", "rule": "self.metadata.namespace.size() > 0"}},
+					"x-kubernetes-validations": []interface{}{map[string]interface{}{"message": "foo", "rule": "self == oldSelf"}, map[string]interface{}{"fieldPath": ".metadata.namespace", "reason": "FieldValueRequired", "rule": "has(self.metadata.__namespace__) && self.metadata.__namespace__.size() > 0"}},
 				},
 			},
 		},
diff --git a/test/integration/testdata/golden.v2.json b/test/integration/testdata/golden.v2.json
index f2f3a45eb..170c05387 100644
--- a/test/integration/testdata/golden.v2.json
+++ b/test/integration/testdata/golden.v2.json
@@ -1287,8 +1287,9 @@
       "rule": "self == oldSelf"
      },
      {
+      "fieldPath": ".metadata.namespace",
       "reason": "FieldValueRequired",
-      "rule": "self.metadata.namespace.size() \u003e 0"
+      "rule": "has(self.metadata.__namespace__) \u0026\u0026 self.metadata.__namespace__.size() \u003e 0"
      }
     ]
    },
diff --git a/test/integration/testdata/golden.v3.json b/test/integration/testdata/golden.v3.json
index f42ffd6c0..c365bc943 100644
--- a/test/integration/testdata/golden.v3.json
+++ b/test/integration/testdata/golden.v3.json
@@ -1249,8 +1249,9 @@
        "rule": "self == oldSelf"
       },
       {
+       "fieldPath": ".metadata.namespace",
        "reason": "FieldValueRequired",
-       "rule": "self.metadata.namespace.size() \u003e 0"
+       "rule": "has(self.metadata.__namespace__) \u0026\u0026 self.metadata.__namespace__.size() \u003e 0"
       }
      ]
     },