Address Envoy Gateway review feedback

Author: KUANPEIEN

static/compatibilities/envoy-gateway.yaml

@@ -7,98 +7,85 @@ chart_name: gateway-helm
 versions:
 - version: 1.8.0
   kube: ['1.35', '1.34', '1.33', '1.32']
-  requirements:
-  - Envoy Proxy distroless-v1.38.0
-  - Rate Limit fe26676d
-  - Gateway API v1.5.1
+  requirements: []
+  chart_version: 1.8.0
+  images: ['docker.io/envoyproxy/gateway:v1.8.0']
   incompatibilities: []
 - version: 1.7.0
   kube: ['1.35', '1.34', '1.33', '1.32']
-  requirements:
-  - Envoy Proxy distroless-v1.37.0
-  - Rate Limit 3fb70258
-  - Gateway API v1.4.1
+  requirements: []
+  chart_version: 1.7.0
+  images: ['docker.io/envoyproxy/gateway:v1.7.0']
   incompatibilities: []
 - version: 1.6.0
   kube: ['1.33', '1.32', '1.31', '1.30']
-  requirements:
-  - Envoy Proxy distroless-v1.36.4
-  - Rate Limit 3fb70258
-  - Gateway API v1.4.0
+  requirements: []
+  chart_version: 1.6.0
+  images: ['docker.io/envoyproxy/gateway:v1.6.0']
   incompatibilities: []
 - version: 1.5.0
   kube: ['1.33', '1.32', '1.31', '1.30']
-  requirements:
-  - Envoy Proxy distroless-v1.35.0
-  - Rate Limit a90e0e5d
-  - Gateway API v1.3.0
+  requirements: []
+  chart_version: 1.5.0
+  images: ['docker.io/envoyproxy/gateway:v1.5.0']
   incompatibilities: []
 - version: 1.4.0
   kube: ['1.33', '1.32', '1.31', '1.30']
-  requirements:
-  - Envoy Proxy distroless-v1.34.1
-  - Rate Limit 3e085e5b
-  - Gateway API v1.3.0
+  requirements: []
+  chart_version: 1.4.0
+  images: ['docker.io/envoyproxy/gateway:v1.4.0']
   incompatibilities: []
 - version: 1.3.0
   kube: ['1.32', '1.31', '1.30', '1.29']
-  requirements:
-  - Envoy Proxy distroless-v1.33.0
-  - Rate Limit 60d8e81b
-  - Gateway API v1.2.1
+  requirements: []
+  chart_version: 1.3.0
+  images: ['docker.io/envoyproxy/gateway:v1.3.0']
   incompatibilities: []
 - version: 1.2.0
   kube: ['1.31', '1.30', '1.29', '1.28']
-  requirements:
-  - Envoy Proxy distroless-v1.32.1
-  - Rate Limit 28b1629a
-  - Gateway API v1.2.0
+  requirements: []
+  chart_version: 1.2.0
+  images: ['docker.io/envoyproxy/gateway:v1.2.0']
   incompatibilities: []
 - version: 1.1.0
   kube: ['1.30', '1.29', '1.28', '1.27']
-  requirements:
-  - Envoy Proxy distroless-v1.31.0
-  - Rate Limit 91484c59
-  - Gateway API v1.1.0
+  requirements: []
+  chart_version: 1.1.0
+  images: ['docker.io/envoyproxy/gateway:v1.1.0']
   incompatibilities: []
 - version: 1.0.0
   kube: ['1.29', '1.28', '1.27', '1.26']
-  requirements:
-  - Envoy Proxy distroless-v1.29.2
-  - Rate Limit 19f2079f
-  - Gateway API v1.0.0
+  requirements: []
+  chart_version: 1.0.0
+  images: ['docker.io/envoyproxy/gateway:v1.0.0']
   incompatibilities: []
 - version: 0.6.0
   kube: ['1.28', '1.27', '1.26']
-  requirements:
-  - Envoy Proxy distroless-v1.28-latest
-  - Rate Limit b9796237
-  - Gateway API v1.0.0
+  requirements: []
+  chart_version: 0.6.0
+  images: ['docker.io/envoyproxy/gateway:v0.6.0']
   incompatibilities: []
 - version: 0.5.0
   kube: ['1.27', '1.26', '1.25']
-  requirements:
-  - Envoy Proxy v1.27-latest
-  - Rate Limit e059638d
-  - Gateway API v0.7.1
+  requirements: []
+  chart_version: 0.5.0
+  images: ['docker.io/envoyproxy/gateway:v0.5.0']
   incompatibilities: []
 - version: 0.4.0
   kube: ['1.27', '1.26', '1.25']
-  requirements:
-  - Envoy Proxy v1.26-latest
-  - Rate Limit 542a6047
-  - Gateway API v0.6.2
+  requirements: []
+  chart_version: 0.4.0
+  images: ['docker.io/envoyproxy/gateway:v0.4.0']
   incompatibilities: []
 - version: 0.3.0
   kube: ['1.26', '1.25', '1.24']
-  requirements:
-  - Envoy Proxy v1.25-latest
-  - Rate Limit f28024e3
-  - Gateway API v0.6.1
+  requirements: []
+  chart_version: 0.3.0
+  images: ['docker.io/envoyproxy/gateway:v0.3.0']
   incompatibilities: []
 - version: 0.2.0
   kube: ['1.24']
-  requirements:
-  - Envoy Proxy v1.23-latest
-  - Gateway API v0.5.1
+  requirements: []
+  chart_version: 0.2.0
+  images: ['docker.io/envoyproxy/gateway:v0.2.0']
   incompatibilities: []

utils/compatibility/scrapers/envoy-gateway.py

@@ -4,12 +4,14 @@
 
 from bs4 import BeautifulSoup
 
-from utils import fetch_page, print_error, update_compatibility_info
+from utils import fetch_page, get_chart_images, print_error, update_compatibility_info
 
 
 APP_NAME = "envoy-gateway"
 COMPATIBILITY_URL = "https://gateway.envoyproxy.io/news/releases/matrix/"
 TARGET_FILE = f"../../static/compatibilities/{APP_NAME}.yaml"
+CHART_URL = "oci://docker.io/envoyproxy/gateway-helm"
+CHART_NAME = "gateway-helm"
 
 
 def _decode(content):
@@ -41,9 +43,6 @@ def _parse_kube_versions(value: str) -> list[str]:
 def _find_compatibility_table(soup: BeautifulSoup):
     required_headers = [
         "Envoy Gateway version",
-        "Envoy Proxy version",
-        "Rate Limit version",
-        "Gateway API version",
         "Kubernetes version",
     ]
 
@@ -54,11 +53,8 @@ def _find_compatibility_table(soup: BeautifulSoup):
     return None, []
 
 
-def _requirement(label: str, value: str) -> str | None:
-    cleaned = value.strip()
-    if not cleaned:
-        return None
-    return f"{label} {cleaned}"
+def _chart_images(chart_version: str) -> list[str]:
+    return get_chart_images(CHART_URL, CHART_NAME, chart_version) or []
 
 
 def scrape():
@@ -74,15 +70,12 @@ def scrape():
         return
 
     gateway_idx = headers.index("Envoy Gateway version")
-    proxy_idx = headers.index("Envoy Proxy version")
-    rate_limit_idx = headers.index("Rate Limit version")
-    gateway_api_idx = headers.index("Gateway API version")
     kube_idx = headers.index("Kubernetes version")
 
     versions = []
     for row in table.find_all("tr")[1:]:
         cells = [td.get_text(" ", strip=True) for td in row.find_all("td")]
-        if len(cells) <= max(gateway_idx, proxy_idx, rate_limit_idx, gateway_api_idx, kube_idx):
+        if len(cells) <= max(gateway_idx, kube_idx):
             continue
 
         version = _clean_version(cells[gateway_idx])
@@ -93,22 +86,14 @@ def scrape():
         if not kube_versions:
             continue
 
-        requirements = [
-            requirement
-            for requirement in [
-                _requirement("Envoy Proxy", cells[proxy_idx]),
-                _requirement("Rate Limit", cells[rate_limit_idx]),
-                _requirement("Gateway API", cells[gateway_api_idx]),
-            ]
-            if requirement
-        ]
-
         versions.append(
             OrderedDict(
                 [
                     ("version", version),
                     ("kube", kube_versions),
-                    ("requirements", requirements),
+                    ("requirements", []),
+                    ("chart_version", version),
+                    ("images", _chart_images(version)),
                     ("incompatibilities", []),
                 ]
             )