1.0.4 - fips and distroless fixes (#32)

* 1.0.4 - fips and distroless fixes * indent fix in manifest.json
tetratelabs · Mar 5, 2021 · dee024a · dee024a
1 parent f95694f
commit dee024a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 46 deletions.
diff --git a/download.sh b/download.sh
@@ -2,7 +2,7 @@
 
 # originally copied from https://wasmtime.dev/install.sh with some modifications
 
-GETISTIO_LATEST_VERSION="1.0.3"
+GETISTIO_LATEST_VERSION="1.0.4"
 
 if [[ -z "${GETISTIO_VERSION}" ]]; then
   VERSION="${GETISTIO_LATEST_VERSION}"

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -147,7 +147,7 @@ func update(t *testing.T) {
 	cmd.Env = env
 	require.NoError(t, cmd.Run(), buf.String())
 	actual := buf.String()
-	assert.Contains(t, actual, "getistio successfully updated from dev to 1.0.3!")
+	assert.Contains(t, actual, "getistio successfully updated from dev to 1.0.4!")
 	t.Log(actual)
 }
 
@@ -201,21 +201,20 @@ func list(t *testing.T) {
 	cmd.Stderr = os.Stderr
 	require.NoError(t, cmd.Run())
 
-	exp := `ISTIO VERSION	  FLAVOR   	FLAVOR VERSION	 K8S VERSIONS  
-   *1.9.0    	  tetrate  	      0       	1.17,1.18,1.19	
-    1.9.0    	tetratefips	      0       	1.17,1.18,1.19	
-    1.9.0    	   istio   	      0       	1.17,1.18,1.19	
-    1.8.3    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.8.3    	tetratefips	      0       	1.16,1.17,1.18	
-    1.8.3    	   istio   	      0       	1.16,1.17,1.18	
-    1.8.2    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.8.2    	tetratefips	      0       	1.16,1.17,1.18	
-    1.8.1    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.8.0    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.7.7    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.7.6    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.7.5    	  tetrate  	      0       	1.16,1.17,1.18	
-    1.7.4    	  tetrate  	      0       	1.16,1.17,1.18`
+	exp := `ISTIO VERSION	  FLAVOR   	FLAVOR VERSION	   K8S VERSIONS     
+   *1.9.0    	  tetrate  	      0       	1.17,1.18,1.19,1.20	
+    1.9.0    	tetratefips	      1       	1.17,1.18,1.19,1.20	
+    1.9.0    	   istio   	      0       	1.17,1.18,1.19,1.20	
+    1.8.3    	  tetrate  	      0       	1.16,1.17,1.18,1.19	
+    1.8.3    	tetratefips	      1       	1.16,1.17,1.18,1.19	
+    1.8.3    	   istio   	      0       	1.16,1.17,1.18,1.19	
+    1.8.2    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.8.1    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.8.0    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.7.7    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.7.6    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.7.5    	  tetrate  	      0       	  1.16,1.17,1.18   	
+    1.7.4    	  tetrate  	      0       	  1.16,1.17,1.18`
 	assert.Contains(t, buf.String(), exp)
 	fmt.Println(buf.String())
 }

diff --git a/manifest.json b/manifest.json
@@ -13,24 +13,26 @@
       "k8s_versions": [
         "1.17",
         "1.18",
-		"1.19"
+        "1.19",
+        "1.20"
       ],
       "release_notes": [
-		"https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
+        "https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
       ],
       "is_security_patch": false
     },
-	{
+    {
       "version": "1.9.0",
       "flavor": "tetratefips",
-      "flavor_version": 0,
+      "flavor_version": 1,
       "k8s_versions": [
         "1.17",
         "1.18",
-		"1.19"
+        "1.19",
+        "1.20"
       ],
       "release_notes": [
-		"https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
+        "https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
       ],
       "is_security_patch": false
     },
@@ -41,10 +43,11 @@
       "k8s_versions": [
         "1.17",
         "1.18",
-		"1.19"
+        "1.19",
+        "1.20"
       ],
       "release_notes": [
-		"https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
+        "https://istio.io/latest/news/releases/1.9.x/announcing-1.9/"
       ],
       "is_security_patch": false
     },
@@ -55,35 +58,38 @@
       "k8s_versions": [
         "1.16",
         "1.17",
-        "1.18"
+        "1.18",
+        "1.19"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
       ],
       "is_security_patch": false
     },
-	{
+    {
       "version": "1.8.3",
       "flavor": "tetratefips",
-      "flavor_version": 0,
+      "flavor_version": 1,
       "k8s_versions": [
         "1.16",
         "1.17",
-        "1.18"
+        "1.18",
+        "1.19"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
       ],
       "is_security_patch": false
     },
-	{
+    {
       "version": "1.8.3",
       "flavor": "istio",
       "flavor_version": 0,
       "k8s_versions": [
         "1.16",
         "1.17",
-        "1.18"
+        "1.18",
+        "1.19"
       ],
       "release_notes": [
         "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.3/"
@@ -103,20 +109,6 @@
         "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.2/"
       ],
       "is_security_patch": false
-    },
-	{
-      "version": "1.8.2",
-      "flavor": "tetratefips",
-      "flavor_version": 0,
-      "k8s_versions": [
-        "1.16",
-        "1.17",
-        "1.18"
-      ],
-      "release_notes": [
-        "https://istio.io/latest/news/releases/1.8.x/announcing-1.8.2/"
-      ],
-      "is_security_patch": false
     },
     {
       "version": "1.8.1",
@@ -160,7 +152,7 @@
       ],
       "is_security_patch": false
     },
-	{
+    {
       "version": "1.7.6",
       "flavor": "tetrate",
       "flavor_version": 0,