Merge pull request #7518 from ameukam/fastly-fix-regex-cache

k8s-ci-robot · web-flow · commit 6f289c59b15a · 2024-11-19T06:04:53.000Z
Fastly: fix the cache rule for the version markers.
diff --git a/infra/fastly/terraform/dl-sandbox.k8s.dev/vcl/binaries.vcl b/infra/fastly/terraform/dl-sandbox.k8s.dev/vcl/binaries.vcl
@@ -45,7 +45,7 @@ sub vcl_fetch {
   }
 
   # Ensure version markers are not cached at the edge
-  if (req.url.path ~ "^/release/(latest|stable)(-\d+(\.\d+))?\.txt\z") {
+  if (req.url.path ~ "^/release/(latest|stable)([^/]*)\.txt\z") {
     set beresp.cacheable = false;
     set beresp.ttl = 0s;
     return (pass);
diff --git a/infra/fastly/terraform/dl.k8s.io/vcl/binaries.vcl b/infra/fastly/terraform/dl.k8s.io/vcl/binaries.vcl
@@ -45,7 +45,7 @@ sub vcl_fetch {
   }
 
   # Ensure version markers are not cached at the edge
-  if (req.url.path ~ "^/release/(latest|stable)(-\d+(\.\d+))?\.txt\z") {
+  if (req.url.path ~ "^/release/(latest|stable)([^/]*)\.txt\z") {
     set beresp.cacheable = false;
     set beresp.ttl = 0s;
     return (pass);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ sub vcl_fetch {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`# Ensure version markers are not cached at the edge`
`48`		`- if (req.url.path ~ "^/release/(latest\|stable)(-\d+(\.\d+))?\.txt\z") {`
	`48`	`+ if (req.url.path ~ "^/release/(latest\|stable)([^/]*)\.txt\z") {`
`49`	`49`	`set beresp.cacheable = false;`
`50`	`50`	`set beresp.ttl = 0s;`
`51`	`51`	`return (pass);`