make webhook support rewriteAppHTTPProbe flag.

lei-tang · Dec 13, 2018 · 43522c1 · 43522c1
1 parent f60f18f
commit 43522c1
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 80 deletions.
diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.patch
@@ -14,10 +14,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml
@@ -0,0 +1,23 @@
+rewriteAppHTTPProbe: true
+initContainers:
+- name: istio-init
+  image: example.com/init:latest
+containers:
+- name: istio-proxy
+  image: example.com/proxy:latest
+  args:
+    - --statusPort
+    - 15020
+imagePullSecrets:
+- name: istio-image-pull-secrets
+volumes:
+- emptyDir:
+    medium: Memory
+  name: istio-envoy
+- name: istio-certs
+  secret:
+    [[ if eq .Spec.ServiceAccountName "" -]]
+    secretName: istio.default
+    [[ else -]]
+    secretName: [[ printf "istio.%s" .Spec.ServiceAccountName ]]
+    [[ end -]]
diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch
@@ -15,10 +15,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/...t/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch b/...t/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch
@@ -15,10 +15,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch
@@ -15,10 +15,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/...be/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch b/...be/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch
@@ -15,10 +15,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch
@@ -14,10 +14,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch
@@ -16,10 +16,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch
@@ -17,10 +17,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/...ct/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch b/...ct/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch
@@ -17,10 +17,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/...kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch b/...kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch
@@ -17,10 +17,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/...g/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch b/...g/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch
@@ -16,10 +16,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch
@@ -16,10 +16,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/...nject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch b/...nject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch
@@ -16,10 +16,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/...ata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch b/...ata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch
@@ -17,10 +17,6 @@
       {
         "name": "istio-proxy",
         "image": "example.com/proxy:latest",
-        "args": [
-          "--statusPort",
-          "15020"
-        ],
         "resources": {}
       }
     ]

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch
@@ -14,10 +14,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch
@@ -14,10 +14,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch
@@ -26,10 +26,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch
@@ -30,10 +30,6 @@
     "value": {
       "name": "istio-proxy",
       "image": "example.com/proxy:latest",
-      "args": [
-        "--statusPort",
-        "15020"
-      ],
       "resources": {}
     }
   },

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml
@@ -4,9 +4,6 @@ initContainers:
 containers:
 - name: istio-proxy
   image: example.com/proxy:latest
-  args:
-    - --statusPort
-    - 15020
 imagePullSecrets:
 - name: istio-image-pull-secrets
 volumes:

diff --git a/pilot/pkg/kube/inject/webhook_test.go b/pilot/pkg/kube/inject/webhook_test.go
@@ -515,8 +515,9 @@ func TestInjectRequired(t *testing.T) {
 
 func TestInject(t *testing.T) {
 	cases := []struct {
-		inputFile string
-		wantFile  string
+		inputFile    string
+		wantFile     string
+		templateFile string
 	}{
 		{
 			inputFile: "TestWebhookInject.yaml",
@@ -595,16 +596,21 @@ func TestInject(t *testing.T) {
 			wantFile:  "TestWebhookInject_replace_backwards_compat.patch",
 		},
 		{
-			inputFile: "TestWebhookInject_http_probe_rewrite.yaml",
-			wantFile:  "TestWebhookInject_http_probe_rewrite.patch",
+			inputFile:    "TestWebhookInject_http_probe_rewrite.yaml",
+			wantFile:     "TestWebhookInject_http_probe_rewrite.patch",
+			templateFile: "TestWebhookInject_http_probe_rewrite_template.yaml",
 		},
 	}
 
 	for i, c := range cases {
 		input := filepath.Join("testdata/webhook", c.inputFile)
 		want := filepath.Join("testdata/webhook", c.wantFile)
+		templateFile := "TestWebhookInject_template.yaml"
+		if c.templateFile != "" {
+			templateFile = c.templateFile
+		}
 		t.Run(fmt.Sprintf("[%d] %s", i, c.inputFile), func(t *testing.T) {
-			wh := createTestWebhookFromFile("testdata/webhook/TestWebhookInject_template.yaml", t)
+			wh := createTestWebhookFromFile(filepath.Join("testdata/webhook", templateFile), t)
 			podYAML := util.ReadFile(input, t)
 			podJSON, err := yaml.YAMLToJSON(podYAML)
 			if err != nil {
@@ -797,6 +803,7 @@ func createTestWebhook(sidecarTemplate string) *Webhook {
 func createTestWebhookFromFile(templateFile string, t *testing.T) *Webhook {
 	t.Helper()
 	sidecarTemplate := string(util.ReadFile(templateFile, t))
+	// fmt.Println("jianfeih debug sidecarTemplate ", sidecarTemplate)
 	return createTestWebhook(sidecarTemplate)
 }