From c1f9082fdc735d2e8b3ef4d06e529dd5cfe82846 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 7 Jun 2019 18:33:32 -0500 Subject: [PATCH] Simplify kubeconfig generation; rename twoday->twodays --- slides/k8s/cni.md | 10 ++++------ slides/k8s/multinode.md | 10 ++++------ slides/{kadm-twoday.yml => kadm-twodays.yml} | 0 3 files changed, 8 insertions(+), 12 deletions(-) rename slides/{kadm-twoday.yml => kadm-twodays.yml} (100%) diff --git a/slides/k8s/cni.md b/slides/k8s/cni.md index ff5d4557..035da391 100644 --- a/slides/k8s/cni.md +++ b/slides/k8s/cni.md @@ -300,12 +300,10 @@ Note: the DaemonSet won't create any pods (yet) since there are no nodes (yet). - Generate the kubeconfig file (replacing `X.X.X.X` with the address of `kuberouter1`): ```bash - kubectl --kubeconfig ~/kubeconfig config \ - set-cluster kubenet --server http://`X.X.X.X`:8080 - kubectl --kubeconfig ~/kubeconfig config \ - set-context kubenet --cluster kubenet - kubectl --kubeconfig ~/kubeconfig config\ - use-context kubenet + kubectl config set-cluster cni --server http://`X.X.X.X`:8080 + kubectl config set-context cni --cluster cni + kubectl config use-context cni + cp ~/.kube/config ~/kubeconfig ``` ] diff --git a/slides/k8s/multinode.md b/slides/k8s/multinode.md index 09c9801a..0efb7dc5 100644 --- a/slides/k8s/multinode.md +++ b/slides/k8s/multinode.md @@ -104,12 +104,10 @@ class: extra-details - Generate the `kubeconfig` file: ```bash - kubectl --kubeconfig ~/kubeconfig config \ - set-cluster kubenet --server http://`X.X.X.X`:8080 - kubectl --kubeconfig ~/kubeconfig config \ - set-context kubenet --cluster kubenet - kubectl --kubeconfig ~/kubeconfig config\ - use-context kubenet + kubectl config set-cluster kubenet --server http://`X.X.X.X`:8080 + kubectl config set-context kubenet --cluster kubenet + kubectl config use-context kubenet + cp ~/.kube/config ~/kubeconfig ``` ] diff --git a/slides/kadm-twoday.yml b/slides/kadm-twodays.yml similarity index 100% rename from slides/kadm-twoday.yml rename to slides/kadm-twodays.yml