Skip to content

Commit 0ca8498

Browse files
committed
Updates site manifest and e2e for 1.12.1 release
Signed-off-by: danehans <[email protected]>
1 parent ffc4d8d commit 0ca8498

File tree

2 files changed

+60
-2
lines changed

2 files changed

+60
-2
lines changed

e2e/e2e_test.go

+14-2
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,27 @@ istioctl switched to 1.8.6-tetrate-v0 now
102102
cmd.Stdout = buf
103103
cmd.Stderr = os.Stderr
104104
require.NoError(t, cmd.Run())
105-
require.Contains(t, buf.String(), `-tetrate-v0 now`)
105+
flavor := "v0"
106+
ver := buf.String()
107+
// 1.12.1 only has a v1 flavor.
108+
if strings.Contains(ver, "1.12.1") {
109+
flavor = "v1"
110+
}
111+
require.Contains(t, buf.String(), fmt.Sprintf(`-tetrate-%s now`, flavor))
106112

107113
// fetch with single flavor flag
108114
cmd = exec.Command("./getmesh", "fetch", "--flavor=tetrate")
109115
buf = new(bytes.Buffer)
110116
cmd.Stdout = buf
111117
cmd.Stderr = os.Stderr
112118
require.NoError(t, cmd.Run())
113-
require.Contains(t, buf.String(), `-tetrate-v0 now`)
119+
flavor = "v0"
120+
ver = buf.String()
121+
// 1.12.1 only has a v1 flavor.
122+
if strings.Contains(ver, "1.12.1") {
123+
flavor = "v1"
124+
}
125+
require.Contains(t, buf.String(), fmt.Sprintf(`-tetrate-%s now`, flavor))
114126

115127
// fetch another version
116128
cmd = exec.Command("./getmesh", "fetch", "--version=1.7.8")

site/manifest.json

+46
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"istio_minor_versions_eol_dates": {
3+
"1.12": "2022-11-18",
34
"1.11": "2022-10-11",
45
"1.10": "2022-07-17",
56
"1.9": "2022-04-08",
@@ -8,6 +9,51 @@
89
"1.6": "2020-11-21"
910
},
1011
"istio_distributions": [
12+
{
13+
"version": "1.12.1",
14+
"flavor": "tetrate",
15+
"flavor_version": 1,
16+
"k8s_versions": [
17+
"1.19",
18+
"1.20",
19+
"1.21",
20+
"1.22"
21+
],
22+
"release_notes": [
23+
"https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
24+
],
25+
"is_security_patch": false
26+
},
27+
{
28+
"version": "1.12.1",
29+
"flavor": "tetratefips",
30+
"flavor_version": 1,
31+
"k8s_versions": [
32+
"1.19",
33+
"1.20",
34+
"1.21",
35+
"1.22"
36+
],
37+
"release_notes": [
38+
"https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
39+
],
40+
"is_security_patch": false
41+
},
42+
{
43+
"version": "1.12.1",
44+
"flavor": "istio",
45+
"flavor_version": 1,
46+
"k8s_versions": [
47+
"1.19",
48+
"1.20",
49+
"1.21",
50+
"1.22"
51+
],
52+
"release_notes": [
53+
"https://istio.io/latest/news/releases/1.12.x/announcing-1.12.1/"
54+
],
55+
"is_security_patch": false
56+
},
1157
{
1258
"version": "1.11.3",
1359
"flavor": "tetrate",

0 commit comments

Comments
 (0)