Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates site manifest and e2e for 1.12.1 release #82

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Updates site manifest and e2e for 1.12.1 release #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ca8498
Updates site manifest and e2e for 1.12.1 release
danehans Jan 14, 2022
566c282
Removes Istio flavor for 1.12.1
danehans Jan 14, 2022
553358f
Patches ingress-gateway deployment image for e2e
danehans Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to retain the canonical way -tetrate-v0


// 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")
Expand Down Expand Up @@ -420,17 +432,27 @@ func checkUpgrade(t *testing.T) {
cmd.Stderr = os.Stderr
require.NoError(t, cmd.Run(), buf.String())
actual := buf.String()
require.Contains(t, actual, "1.11.3-tetrate-v0 is the latest version in 1.11-tetrate")
require.Contains(t, actual, "1.12.1-tetrate-v1 is the latest version in 1.12-tetrate")

// change image to 1.8.1-tetrate-v0
image := "containers.istio.tetratelabs.com/pilot:1.8.1-tetrate-v0"
// Update the Istiod image
patch := fmt.Sprintf(`{"spec":{"template":{"spec":{"containers":[{"name":"discovery","image":"%s"}]}}}}`,
image)
cmd = exec.Command("kubectl", "patch", "deployment",
"-nistio-system", "istiod", "-p", patch)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
require.NoError(t, cmd.Run())
// Update the ingress gateway image
image = "containers.istio.tetratelabs.com/proxyv2:1.8.1-tetrate-v0"
patch = fmt.Sprintf(`{"spec":{"template":{"spec":{"containers":[{"name":"istio-proxy","image":"%s"}]}}}}`,
image)
cmd = exec.Command("kubectl", "patch", "deployment",
"-nistio-system", "istio-ingressgateway", "-p", patch)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
require.NoError(t, cmd.Run())
require.Eventually(t, func() bool {
cmd := exec.Command("./getmesh", "check-upgrade")
buf := new(bytes.Buffer)
Expand Down
46 changes: 46 additions & 0 deletions site/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -8,6 +9,51 @@
"1.6": "2020-11-21"
},
"istio_distributions": [
{
"version": "1.12.1",
"flavor": "tetrate",
"flavor_version": 1,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.12.1 - Did we have a v0 release already?

Copy link
Author

@danehans danehans Jan 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deva26 a v0 was tagged but never built. A v1 was tagged, I believe by @yskopets, which I used to build the images. Should I build images based on the v0 tag so we have both v0 and v1 flavors or should I build v0 images based on the v1 tag?

"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": 0,
"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",
Expand Down