api: rename jwksUri to uri (#12970)

Signed-off-by: John Howard <[email protected]>
Signed-off-by: Rachael Graham <[email protected]>

Author: howardjohn

api/v1alpha1/agentgateway_policy_types.go

@@ -514,12 +514,12 @@ type AgentJWKS struct {
 	Inline *string `json:"inline,omitempty"`
 }
 
-// +kubebuilder:validation:ExactlyOneOf=jwksUri;backendRef
+// +kubebuilder:validation:ExactlyOneOf=uri;backendRef
 type AgentRemoteJWKS struct {
 	// IdP jwks endpoint. Default tls settings are used to connect to this url.
 	// +kubebuilder:validation:Pattern=`^(https|http):\/\/[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*(:\d+)?\/.*$`
 	// +optional
-	JwksUri string `json:"jwksUri,omitempty"`
+	JwksUri string `json:"uri,omitempty"`
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="matches(self, '^([0-9]{1,5}(h|m|s|ms)){1,4}$')",message="invalid duration value"
 	// +kubebuilder:validation:XValidation:rule="duration(self) >= duration('5m')",message="cacheDuration must be at least 5m."

install/helm/kgateway-crds/templates/gateway.kgateway.dev_agentgatewaypolicies.yaml

@@ -2925,16 +2925,16 @@ spec:
                                         rule: matches(self, '^([0-9]{1,5}(h|m|s|ms)){1,4}$')
                                       - message: cacheDuration must be at least 5m.
                                         rule: duration(self) >= duration('5m')
-                                    jwksUri:
+                                    uri:
                                       description: IdP jwks endpoint. Default tls
                                         settings are used to connect to this url.
                                       pattern: ^(https|http):\/\/[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?)*(:\d+)?\/.*$
                                       type: string
                                   type: object
                                   x-kubernetes-validations:
-                                  - message: exactly one of the fields in [jwksUri
-                                      backendRef] must be set
-                                    rule: '[has(self.jwksUri),has(self.backendRef)].filter(x,x==true).size()
+                                  - message: exactly one of the fields in [uri backendRef]
+                                      must be set
+                                    rule: '[has(self.uri),has(self.backendRef)].filter(x,x==true).size()
                                       == 1'
                               type: object
                               x-kubernetes-validations:

test/e2e/features/agentgateway/remotejwtauth/testdata/secured-gateway-policy.yaml

@@ -29,8 +29,8 @@ spec:
       - issuer: https://kgateway.dev
         jwks:
           remote:
-            jwksUri: https://dummy-idp.default:8443/org-one/keys
+            uri: https://dummy-idp.default:8443/org-one/keys
       - issuer: https://kgateway.dev
         jwks:
           remote:
-            jwksUri: https://dummy-idp.default:8443/org-two/keys
+            uri: https://dummy-idp.default:8443/org-two/keys

test/e2e/features/agentgateway/remotejwtauth/testdata/secured-route.yaml

@@ -29,8 +29,8 @@ spec:
       - issuer: https://kgateway.dev
         jwks:
           remote:
-            jwksUri: https://dummy-idp.default:8443/org-one/keys
+            uri: https://dummy-idp.default:8443/org-one/keys
       - issuer: https://kgateway.dev
         jwks:
           remote:
-            jwksUri: https://dummy-idp.default:8443/org-two/keys
+            uri: https://dummy-idp.default:8443/org-two/keys