Fix version script to detect 2 digit minor versions (#1742)

Signed-off-by: Alex Leong <[email protected]>
linkerd · Feb 20, 2024 · 707979f · 707979f
1 parent b5d95ea
commit 707979f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/bin/export-channel-versions b/bin/export-channel-versions
@@ -3,8 +3,8 @@
 releases_url="https://api.github.com/repos/linkerd/linkerd2/releases"
 
 # Match examples: `"tag_name": "stable-2.7.0",`
-stable_tag_regex="\"tag_name\": \"stable-[0-9]+\.[0-9]+\.[0-9]\""
-edge_tag_regex="\"tag_name\": \"edge-[0-9]+\.[0-9]+\.[0-9]\""
+stable_tag_regex="\"tag_name\": \"stable-[0-9]+\.[0-9]+\.[0-9]+\""
+edge_tag_regex="\"tag_name\": \"edge-[0-9]+\.[0-9]+\.[0-9]+\""
 
 export L5D2_STABLE_VERSION=$(curl -s $releases_url | awk -v pattern="$stable_tag_regex" '$0 ~ pattern {gsub(/"/, "", $2); gsub(/,$/,""); print $2}' | sort -V | tail -n 1)
 export L5D2_EDGE_VERSION=$(curl -s $releases_url | awk -v pattern="$edge_tag_regex" '$0 ~ pattern {gsub(/"/, "", $2); gsub(/,$/,""); print $2; exit}')
diff --git a/linkerd.io/content/releases/release_matrix.json b/linkerd.io/content/releases/release_matrix.json
@@ -31,11 +31,11 @@
             "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.8.5"
         }
     },
-    "stable-2.14.8": {
+    "stable-2.14.9": {
         "linkerd-control-plane": {
             "chart_name": "linkerd-control-plane",
-            "chart_version": "1.16.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.9"
+            "chart_version": "1.16.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.10"
         },
         "linkerd-crds": {
             "chart_name": "linkerd-crds",
@@ -44,23 +44,23 @@
         },
         "linkerd-jaeger": {
             "chart_name": "linkerd-jaeger",
-            "chart_version": "30.12.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.9"
+            "chart_version": "30.12.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.10"
         },
         "linkerd-multicluster": {
             "chart_name": "linkerd-multicluster",
-            "chart_version": "30.11.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.9"
+            "chart_version": "30.11.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.10"
         },
         "linkerd-viz": {
             "chart_name": "linkerd-viz",
-            "chart_version": "30.12.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.9"
+            "chart_version": "30.12.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.10"
         },
         "linkerd2-cni": {
             "chart_name": "linkerd2-cni",
-            "chart_version": "30.12.1",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.1"
+            "chart_version": "30.12.2",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.2"
         }
     },
     "stable-2.12.6": {

diff --git a/linkerd.io/content/releases/release_matrix.yaml b/linkerd.io/content/releases/release_matrix.yaml
@@ -90,29 +90,29 @@ stable-2.13.7:
         chart_name: linkerd2-cni
         chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.8.5
         chart_version: 30.8.5
-stable-2.14.8:
+stable-2.14.9:
     linkerd-control-plane:
         chart_name: linkerd-control-plane
-        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.9
-        chart_version: 1.16.9
+        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.10
+        chart_version: 1.16.10
     linkerd-crds:
         chart_name: linkerd-crds
         chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-crds/1.8.0
         chart_version: 1.8.0
     linkerd-jaeger:
         chart_name: linkerd-jaeger
-        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.9
-        chart_version: 30.12.9
+        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.10
+        chart_version: 30.12.10
     linkerd-multicluster:
         chart_name: linkerd-multicluster
-        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.9
-        chart_version: 30.11.9
+        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.10
+        chart_version: 30.11.10
     linkerd-viz:
         chart_name: linkerd-viz
-        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.9
-        chart_version: 30.12.9
+        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.10
+        chart_version: 30.12.10
     linkerd2-cni:
         chart_name: linkerd2-cni
-        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.1
-        chart_version: 30.12.1
+        chart_url: https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.2
+        chart_version: 30.12.2
 
diff --git a/linkerd.io/data/releases/release_matrix.json b/linkerd.io/data/releases/release_matrix.json
@@ -31,11 +31,11 @@
             "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.8.5"
         }
     },
-    "stable-2.14.8": {
+    "stable-2.14.9": {
         "linkerd-control-plane": {
             "chart_name": "linkerd-control-plane",
-            "chart_version": "1.16.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.9"
+            "chart_version": "1.16.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-control-plane/1.16.10"
         },
         "linkerd-crds": {
             "chart_name": "linkerd-crds",
@@ -44,23 +44,23 @@
         },
         "linkerd-jaeger": {
             "chart_name": "linkerd-jaeger",
-            "chart_version": "30.12.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.9"
+            "chart_version": "30.12.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-jaeger/30.12.10"
         },
         "linkerd-multicluster": {
             "chart_name": "linkerd-multicluster",
-            "chart_version": "30.11.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.9"
+            "chart_version": "30.11.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-multicluster/30.11.10"
         },
         "linkerd-viz": {
             "chart_name": "linkerd-viz",
-            "chart_version": "30.12.9",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.9"
+            "chart_version": "30.12.10",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd-viz/30.12.10"
         },
         "linkerd2-cni": {
             "chart_name": "linkerd2-cni",
-            "chart_version": "30.12.1",
-            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.1"
+            "chart_version": "30.12.2",
+            "chart_url": "https://artifacthub.io/packages/helm/linkerd2/linkerd2-cni/30.12.2"
         }
     },
     "stable-2.12.6": {