update the TestWebhookInject.

istio · Jan 28, 2019 · a2a7744 · a2a7744
1 parent 36fd45c
commit a2a7744
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/pilot/cmd/pilot-agent/status/server_test.go b/pilot/cmd/pilot-agent/status/server_test.go
@@ -64,6 +64,10 @@ func TestNewServer(t *testing.T) {
 			httpProbe: `{"/app-health/hello-world/readyz": {"path": "/hello/sunnyvale", "port": 8080},
 "/app-health/business/livez": {"port": 9090}}`,
 		},
+		// A valid input without any prober info.
+		{
+			httpProbe: `{}`,
+		},
 	}
 	for _, tc := range testCases {
 		_, err := NewServer(Config{

diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch b/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch
@@ -24,7 +24,9 @@
       "image": "example.com/proxy:latest",
       "args": [
         "--statusPort",
-        "15020"
+        "15020",
+        "--kubeAppProberConfig",
+        "{\"/app-health/hello/livez\":{\"path\":\"/live\",\"port\":80},\"/app-health/hello/readyz\":{\"path\":\"/ready\",\"port\":3333},\"/app-health/second/livez\":{\"port\":9000}}"
       ],
       "resources": {}
     }

diff --git a/pilot/pkg/kube/inject/webhook.go b/pilot/pkg/kube/inject/webhook.go
@@ -36,6 +36,7 @@ import (
 
 	meshconfig "istio.io/api/mesh/v1alpha1"
 	"istio.io/istio/pilot/cmd"
+	"istio.io/istio/pilot/cmd/pilot-agent/status"
 	"istio.io/istio/pilot/pkg/model"
 	"istio.io/istio/pkg/log"
 )
@@ -436,25 +437,25 @@ func createPatch(pod *corev1.Pod, prevStatus *SidecarInjectionStatus, annotation
 	patch = append(patch, removeImagePullSecrets(pod.Spec.ImagePullSecrets, prevStatus.ImagePullSecrets, "/spec/imagePullSecrets")...)
 
 	if appProbers := extractKubeAppProbers(&pod.Spec); appProbers != nil {
-		// b, err := json.Marshal(appProbers)
-		// if err != nil {
-		// 	log.Errorf("failed to serialize the app prober config %v", err)
-		// 	return nil, fmt.Errorf("failed to serialize app prober config %v", err)
-		// }
-		// TODO: here see if the sic is used again and again... might need to make a copy if so...
-		// We don't have to escape json encoding here when using golang libraries.
-		// sidecar.Args = append(sidecar.Args,
-		// 	[]string{fmt.Sprintf("--%v", status.KubeAppProberCmdFlagName), string(b)}...)
-		// var sidecar *corev1.Container
-		// for i := range sic.Containers {
-		// 	if sic.Containers[i].Name == istioProxyContainerName {
-		// 		sidecar = &sic.Containers[i].
-		// 		break
-		// 	}
-		// }
-		// if sidecar == nil {
-		// 	return nil, nil
-		// }
+		b, err := json.Marshal(appProbers)
+		if err != nil {
+			log.Errorf("failed to serialize the app prober config %v", err)
+			return nil, fmt.Errorf("failed to serialize app prober config %v", err)
+		}
+		var sidecar *corev1.Container
+		for i := range sic.Containers {
+			if sic.Containers[i].Name == istioProxyContainerName {
+				sidecar = &sic.Containers[i]
+				break
+			}
+		}
+		if sidecar != nil {
+			log.Errorf("Not found sidecar container, skip adding k8s app prober config")
+			// TODO: here see if the sic is used again and again... might need to make a copy if so...
+			// We don't have to escape json encoding here when using golang libraries.
+			sidecar.Args = append(sidecar.Args,
+				[]string{fmt.Sprintf("--%v", status.KubeAppProberCmdFlagName), string(b)}...)
+		}
 	}
 
 	patch = append(patch, addContainer(pod.Spec.InitContainers, sic.InitContainers, "/spec/initContainers")...)