Kevin's feedback

Signed-off-by: Ivan Sim <[email protected]>
linkerd · Mar 13, 2019 · ab38261 · ab38261
1 parent 1dbf22f
commit ab38261
Show file tree

Hide file tree

Showing 3 changed files with 564 additions and 462 deletions.
diff --git a/controller/proxy-injector/webhook_test.go b/controller/proxy-injector/webhook_test.go
@@ -154,7 +154,7 @@ func TestGetPatch(t *testing.T) {
 			t.Fatalf("Unexepected Marshal error: %s", err)
 		}
 
-		expected := `[{"op":"replace","path":"/spec/template/spec/containers/1","value":{"name":"linkerd-proxy","image":"gcr.io/linkerd-io/proxy:","resources":{},"livenessProbe":{"httpGet":{"path":"/metrics","port":4191},"initialDelaySeconds":10},"readinessProbe":{"httpGet":{"path":"/metrics","port":4191},"initialDelaySeconds":10},"imagePullPolicy":"IfNotPresent","securityContext":{"runAsUser":2102}}},{"op":"replace","path":"/spec/template/spec/initContainers/0","value":{"name":"linkerd-init","image":"gcr.io/linkerd-io/proxy-init:","args":["--incoming-proxy-port","4143","--outgoing-proxy-port","4140","--proxy-uid","2102","--inbound-ports-to-ignore","4190,4191"],"resources":{},"imagePullPolicy":"IfNotPresent"}}]`
+		expected := `[{"op":"replace","path":"/spec/template/spec/containers/1","value":{"name":"linkerd-proxy","image":"gcr.io/linkerd-io/proxy:","resources":{},"livenessProbe":{"httpGet":{"path":"/metrics","port":4191},"initialDelaySeconds":10},"readinessProbe":{"httpGet":{"path":"/metrics","port":4191},"initialDelaySeconds":10},"securityContext":{"runAsUser":2102}}},{"op":"replace","path":"/spec/template/spec/initContainers/0","value":{"name":"linkerd-init","image":"gcr.io/linkerd-io/proxy-init:","args":["--incoming-proxy-port","4143","--outgoing-proxy-port","4140","--proxy-uid","2102","--inbound-ports-to-ignore","4190,4191"],"resources":{}}}]`
 		if string(actual) != expected {
 			t.Errorf("Expected: '%s'\nActual :'%s'", expected, actual)
 		}