address issues for failing ci

slayer321 · slayer321 · commit d2ae94e0a716 · 2025-07-30T17:19:52.000+05:30
Signed-off-by: sachin maurya &lt;sachin.maurya7666@gmail.com&gt;
diff --git a/api/v1alpha1/jwt_types.go b/api/v1alpha1/jwt_types.go
@@ -111,22 +111,22 @@ type RemoteJWKS struct {
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=253
 	URI string `json:"uri"`
-	//Duration after which the cached JWKS should be expired. If not specified, default cache duration is 5 minutes.
+	// Duration after which the cached JWKS should be expired. If not specified, default cache duration is 5 minutes.
 
 	// +kubebuilder:default="300s"
 	// +kubebuilder:validation:Format=duration
 	// +optional
 	CacheDuration *metav1.Duration `json:"cacheDuration,omitempty"`
 
-	//Fetch Jwks asynchronously in the main thread before the listener is activated. Fetched Jwks can be used by all worker threads.
+	// Fetch Jwks asynchronously in the main thread before the listener is activated. Fetched Jwks can be used by all worker threads.
 	// +optional
 	AsyncFetch *JwksAsyncFetch `json:"asyncFetch,omitempty"`
 }
 
 // JwksAsyncFetch is used to Fetch Jwks asynchronously in the main thread before the listener is activated.
 type JwksAsyncFetch struct {
-	//If false, the listener is activated after the initial fetch is completed. The initial fetch result can be either successful or failed.
-	//If true, it is activated without waiting for the initial fetch to complete.
+	// If false, the listener is activated after the initial fetch is completed. The initial fetch result can be either successful or failed.
+	// If true, it is activated without waiting for the initial fetch to complete.
 
 	// +optional
 	FastListener bool `json:"fastListener,omitempty"`
diff --git a/internal/gatewayapi/testdata/custom-filter-order.out.yaml b/internal/gatewayapi/testdata/custom-filter-order.out.yaml
@@ -328,8 +328,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
             - audiences:
               - two.foo.com
@@ -339,8 +337,6 @@ xdsIR:
               issuer: http://two.example.com
               name: example2
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: http://two.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml b/internal/gatewayapi/testdata/securitypolicy-override-replace.out.yaml
@@ -625,8 +625,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
       - destination:
           metadata:
@@ -737,8 +735,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
     - address: 0.0.0.0
       hostnames:
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-authoriztion-jwt-claim.out.yaml
@@ -230,8 +230,6 @@ xdsIR:
               issuer: https://two.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://two.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-and-invalid-oidc.out.yaml
@@ -295,8 +295,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
       - destination:
           metadata:
@@ -340,8 +338,6 @@ xdsIR:
               issuer: https://two.example.com
               name: example2
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-backendcluster.out.yaml
@@ -265,8 +265,6 @@ xdsIR:
               issuer: https://foo.bar.com
               name: foobar
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 destination:
                   metadata:
                     kind: SecurityPolicy
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-optional.out.yaml
@@ -340,8 +340,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
             - audiences:
               - two.foo.com
@@ -351,8 +349,6 @@ xdsIR:
               issuer: https://two.example.com
               name: example2
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://two.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
@@ -428,8 +424,6 @@ xdsIR:
               issuer: https://three.example.com
               name: example3
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://three.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-serviceimport.out.yaml
@@ -247,8 +247,6 @@ xdsIR:
               issuer: https://foo.bar.com
               name: foobar
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 destination:
                   metadata:
                     kind: SecurityPolicy
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt-with-custom-extractor.out.yaml
@@ -339,8 +339,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
             - audiences:
               - two.foo.com
@@ -350,8 +348,6 @@ xdsIR:
               issuer: https://two.example.com
               name: example2
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://two.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
@@ -426,8 +422,6 @@ xdsIR:
               issuer: https://three.example.com
               name: example3
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://three.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-jwt.out.yaml
@@ -331,8 +331,6 @@ xdsIR:
               issuer: https://one.example.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://one.example.com/jwt/public-key/jwks.json
             - audiences:
               - two.foo.com
@@ -342,8 +340,6 @@ xdsIR:
               issuer: http://two.example.com
               name: example2
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: http://two.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
@@ -410,8 +406,6 @@ xdsIR:
               issuer: https://three.example.com
               name: example3
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://three.example.com/jwt/public-key/jwks.json
     readyListener:
       address: 0.0.0.0
diff --git a/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml b/internal/gatewayapi/testdata/securitypolicy-with-oidc-and-jwt-passthrough.out.yaml
@@ -199,8 +199,6 @@ xdsIR:
             - issuer: https://oauth.foo.com
               name: example1
               remoteJWKS:
-                asyncFetch: null
-                cacheDuration: null
                 uri: https://oauth.foo.com/jwt/public-key/jwks.json
           oidc:
             clientID: client.oauth.foo.com
diff --git a/internal/ir/xds.go b/internal/ir/xds.go
@@ -1073,19 +1073,19 @@ type RemoteJWKS struct {
 	// If a custom trust bundle is needed, it can be specified in a BackendTLSConfig resource and target the BackendRefs.
 	URI string `json:"uri"`
 
-	//Duration after which the cached JWKS should be expired. If not specified, default cache duration is 5 minutes.
+	// Duration after which the cached JWKS should be expired. If not specified, default cache duration is 5 minutes.
 	CacheDuration *metav1.Duration `json:"cacheDuration,omitempty"`
 
-	//Fetch Jwks asynchronously in the main thread before the listener is activated. Fetched Jwks can be used by all worker threads.
+	// Fetch Jwks asynchronously in the main thread before the listener is activated. Fetched Jwks can be used by all worker threads.
 	AsyncFetch *JwksAsyncFetch `json:"asyncFetch,omitempty"`
 }
 
 // JwksAsyncFetch is used to Fetch Jwks asynchronously in the main thread before the listener is activated.
 //
 // +k8s:deepcopy-gen=true
 type JwksAsyncFetch struct {
-	//If false, the listener is activated after the initial fetch is completed. The initial fetch result can be either successful or failed.
-	//If true, it is activated without waiting for the initial fetch to complete.
+	// If false, the listener is activated after the initial fetch is completed. The initial fetch result can be either successful or failed.
+	// If true, it is activated without waiting for the initial fetch to complete.
 	FastListener bool `json:"fastListener,omitempty"`
 	// The duration to refetch after a failed fetch.
 	FailedRefetchDuration *metav1.Duration `json:"failedRefetchDuration,omitempty"`
diff --git a/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml b/internal/xds/translator/testdata/in/xds-ir/jwt-single-route-single-match.yaml
@@ -22,6 +22,9 @@ http:
           remoteJWKS:
             uri: https://localhost/jwt/public-key/jwks.json
             cacheDuration: 300s
+            asyncFetch:
+              fastListener: true
+              failedRefetchDuration: 2s
     destination:
       name: "first-route-dest"
       settings:
diff --git a/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/jwt-single-route-single-match.listeners.yaml
@@ -28,7 +28,9 @@
                   - scope
                 payloadInMetadata: example
                 remoteJwks:
-                  asyncFetch: {}
+                  asyncFetch:
+                    failedRefetchDuration: 2s
+                    fastListener: true
                   cacheDuration: 300s
                   httpUri:
                     cluster: localhost_443
diff --git a/test/helm/gateway-crds-helm/all.out.yaml b/test/helm/gateway-crds-helm/all.out.yaml
@@ -41873,8 +41873,13 @@ spec:
                             HTTP/HTTPS endpoint.
                           properties:
                             asyncFetch:
+                              description: Fetch Jwks asynchronously in the main thread
+                                before the listener is activated. Fetched Jwks can
+                                be used by all worker threads.
                               properties:
                                 failedRefetchDuration:
+                                  description: The duration to refetch after a failed
+                                    fetch.
                                   type: string
                                 fastListener:
                                   type: boolean
diff --git a/test/helm/gateway-crds-helm/envoy-gateway-crds.out.yaml b/test/helm/gateway-crds-helm/envoy-gateway-crds.out.yaml
@@ -24561,8 +24561,13 @@ spec:
                             HTTP/HTTPS endpoint.
                           properties:
                             asyncFetch:
+                              description: Fetch Jwks asynchronously in the main thread
+                                before the listener is activated. Fetched Jwks can
+                                be used by all worker threads.
                               properties:
                                 failedRefetchDuration:
+                                  description: The duration to refetch after a failed
+                                    fetch.
                                   type: string
                                 fastListener:
                                   type: boolean
