From 044c20358e2b861db2cf8b986a717e666a04fdf4 Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 12 Jul 2018 22:37:47 +0800 Subject: [PATCH] fixed: references to sleep.yaml (#1770) --- .../kubernetes/sidecar-injection/index.md | 8 ++++---- .../tasks/security/https-overlay/index.md | 20 +++++++++---------- .../tasks/traffic-management/egress/index.md | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/content/docs/setup/kubernetes/sidecar-injection/index.md b/content/docs/setup/kubernetes/sidecar-injection/index.md index 630d4e8491..703605a129 100644 --- a/content/docs/setup/kubernetes/sidecar-injection/index.md +++ b/content/docs/setup/kubernetes/sidecar-injection/index.md @@ -59,7 +59,7 @@ from local files. Inject the sidecar into the deployment using the in-cluster configuration. {{< text bash >}} -$ istioctl kube-inject -f samples/sleep/sleep.yaml | kubectl apply -f - +$ istioctl kube-inject -f @samples/sleep/sleep.yaml@ | kubectl apply -f - {{< /text >}} Alternatively, inject using local copies of the configuration. @@ -81,7 +81,7 @@ Run `kube-inject` over the input file and deploy. $ istioctl kube-inject \ --injectConfigFile inject-config.yaml \ --meshConfigFile mesh-config.yaml \ - --filename samples/sleep/sleep.yaml \ + --filename @samples/sleep/sleep.yaml@ \ --output sleep-injected.yaml | kubectl apply -f - {{< /text >}} @@ -128,7 +128,7 @@ service in `values.yaml`. You can override the default values to customize the i Deploy sleep app. Verify both deployment and pod have a single container. {{< text bash >}} -$ kubectl apply -f samples/sleep/sleep.yaml +$ kubectl apply -f @samples/sleep/sleep.yaml@ $ kubectl get deployment -o wide NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR sleep 1 1 1 1 12m sleep tutum/curl app=sleep @@ -291,7 +291,7 @@ containers: - sleep {{< /text >}} -when applied over a pod defined by the pod template spec in `samples/sleep/sleep.yaml` +when applied over a pod defined by the pod template spec in [`samples/sleep/sleep.yaml`]({{< github_tree >}}/samples/sleep/sleep.yaml) #### Uninstalling the automatic sidecar injector diff --git a/content/docs/tasks/security/https-overlay/index.md b/content/docs/tasks/security/https-overlay/index.md index fc0a266714..96cfafad98 100644 --- a/content/docs/tasks/security/https-overlay/index.md +++ b/content/docs/tasks/security/https-overlay/index.md @@ -46,7 +46,7 @@ configmap "nginxconfigmap" created This section creates a NGINX-based HTTPS service. {{< text bash >}} -$ kubectl apply -f samples/https/nginx-app.yaml +$ kubectl apply -f @samples/https/nginx-app.yaml@ service "my-nginx" created replicationcontroller "my-nginx" created {{< /text >}} @@ -54,7 +54,7 @@ replicationcontroller "my-nginx" created Then, create another pod to call this service. {{< text bash >}} -$ kubectl apply -f <(bin/istioctl kube-inject -f samples/sleep/sleep.yaml) +$ kubectl apply -f <(bin/istioctl kube-inject -f @samples/sleep/sleep.yaml@) {{< /text >}} Get the pods @@ -98,13 +98,13 @@ disabled. So you only need to redeploy the NGINX HTTPS service with sidecar. Delete the HTTPS service. {{< text bash >}} -$ kubectl delete -f samples/https/nginx-app.yaml +$ kubectl delete -f @samples/https/nginx-app.yaml@ {{< /text >}} Deploy it with a sidecar {{< text bash >}} -$ kubectl apply -f <(bin/istioctl kube-inject -f samples/https/nginx-app.yaml) +$ kubectl apply -f <(bin/istioctl kube-inject -f @samples/https/nginx-app.yaml@) {{< /text >}} Make sure the pod is up and running @@ -182,10 +182,10 @@ servicegraph-5849b7d696-jrk8h 1/1 Running 0 23h Then redeploy the HTTPS service and sleep service {{< text bash >}} -$ kubectl delete -f <(bin/istioctl kube-inject -f samples/sleep/sleep.yaml) -$ kubectl apply -f <(bin/istioctl kube-inject -f samples/sleep/sleep.yaml) -$ kubectl delete -f <(bin/istioctl kube-inject -f samples/https/nginx-app.yaml) -$ kubectl apply -f <(bin/istioctl kube-inject -f samples/https/nginx-app.yaml) +$ kubectl delete -f <(bin/istioctl kube-inject -f @samples/sleep/sleep.yaml@) +$ kubectl apply -f <(bin/istioctl kube-inject -f @samples/sleep/sleep.yaml@) +$ kubectl delete -f <(bin/istioctl kube-inject -f @samples/https/nginx-app.yaml@) +$ kubectl apply -f <(bin/istioctl kube-inject -f @samples/https/nginx-app.yaml@) {{< /text >}} Make sure the pod is up and running @@ -227,8 +227,8 @@ since the traffic will be downgraded to http from nginx-proxy to nginx. ## Cleanup {{< text bash >}} -$ kubectl delete -f samples/sleep/sleep.yaml -$ kubectl delete -f samples/https/nginx-app.yaml +$ kubectl delete -f @samples/sleep/sleep.yaml@ +$ kubectl delete -f @samples/https/nginx-app.yaml@ $ kubectl delete configmap nginxconfigmap $ kubectl delete secret nginxsecret {{< /text >}} diff --git a/content/docs/tasks/traffic-management/egress/index.md b/content/docs/tasks/traffic-management/egress/index.md index b9059fd69b..b3ad5a5d25 100644 --- a/content/docs/tasks/traffic-management/egress/index.md +++ b/content/docs/tasks/traffic-management/egress/index.md @@ -29,13 +29,13 @@ or alternatively, to bypass the Istio proxy for a specific range of IPs. If you have enabled [automatic sidecar injection](/docs/setup/kubernetes/sidecar-injection/#automatic-sidecar-injection), deploy the `sleep` application: {{< text bash >}} - $ kubectl apply -f samples/sleep/sleep.yaml + $ kubectl apply -f @samples/sleep/sleep.yaml@ {{< /text >}} Otherwise, you have to manually inject the sidecar before deploying the `sleep` application: {{< text bash >}} - $ kubectl apply -f <(istioctl kube-inject -f samples/sleep/sleep.yaml) + $ kubectl apply -f <(istioctl kube-inject -f @samples/sleep/sleep.yaml@) {{< /text >}} Note that any pod that you can `exec` and `curl` from will do for the procedures below. @@ -269,7 +269,7 @@ cluster provider specific knowledge and configuration. 1. Shutdown the [sleep]({{< github_tree >}}/samples/sleep) service: {{< text bash >}} - $ kubectl delete -f samples/sleep/sleep.yaml + $ kubectl delete -f @samples/sleep/sleep.yaml@ {{< /text >}} 1. Update the `ConfigMap` _istio-sidecar-injector_ to redirect all outbound traffic to the sidecar proxies: