Updates site manifest and e2e for 1.12.1 release

Signed-off-by: danehans <[email protected]>
tetratelabs · Jan 14, 2022 · 0ca8498 · 0ca8498
1 parent ffc4d8d
commit 0ca8498
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 2 deletions.
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -102,15 +102,27 @@ istioctl switched to 1.8.6-tetrate-v0 now
 	cmd.Stdout = buf
 	cmd.Stderr = os.Stderr
 	require.NoError(t, cmd.Run())
-	require.Contains(t, buf.String(), `-tetrate-v0 now`)
+	flavor := "v0"
+	ver := buf.String()
+	// 1.12.1 only has a v1 flavor.
+	if strings.Contains(ver, "1.12.1") {
+		flavor = "v1"
+	}
+	require.Contains(t, buf.String(), fmt.Sprintf(`-tetrate-%s now`, flavor))
 
 	// fetch with single flavor flag
 	cmd = exec.Command("./getmesh", "fetch", "--flavor=tetrate")
 	buf = new(bytes.Buffer)
 	cmd.Stdout = buf
 	cmd.Stderr = os.Stderr
 	require.NoError(t, cmd.Run())
-	require.Contains(t, buf.String(), `-tetrate-v0 now`)
+	flavor = "v0"
+	ver = buf.String()
+	// 1.12.1 only has a v1 flavor.
+	if strings.Contains(ver, "1.12.1") {
+		flavor = "v1"
+	}
+	require.Contains(t, buf.String(), fmt.Sprintf(`-tetrate-%s now`, flavor))
 
 	// fetch another version
 	cmd = exec.Command("./getmesh", "fetch", "--version=1.7.8")

diff --git a/site/manifest.json b/site/manifest.json
@@ -1,5 +1,6 @@
 {
   "istio_minor_versions_eol_dates": {
+    "1.12": "2022-11-18",
     "1.11": "2022-10-11",
     "1.10": "2022-07-17",
     "1.9": "2022-04-08",
@@ -8,6 +9,51 @@
     "1.6": "2020-11-21"
   },
   "istio_distributions": [
+    {
+      "version": "1.12.1",
+      "flavor": "tetrate",
+      "flavor_version": 1,
+      "k8s_versions": [
+        "1.19",
+        "1.20",
+        "1.21",
+        "1.22"
+      ],
+      "release_notes": [
+        "https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
+      ],
+      "is_security_patch": false
+    },
+    {
+      "version": "1.12.1",
+      "flavor": "tetratefips",
+      "flavor_version": 1,
+      "k8s_versions": [
+        "1.19",
+        "1.20",
+        "1.21",
+        "1.22"
+      ],
+      "release_notes": [
+        "https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
+      ],
+      "is_security_patch": false
+    },
+    {
+      "version": "1.12.1",
+      "flavor": "istio",
+      "flavor_version": 1,
+      "k8s_versions": [
+        "1.19",
+        "1.20",
+        "1.21",
+        "1.22"
+      ],
+      "release_notes": [
+        "https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
+      ],
+      "is_security_patch": false
+    },
    {
       "version": "1.11.3",
       "flavor": "tetrate",