From 79ad2fcc7e50d984c295d5b16c3ddacc96d39878 Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Sat, 15 Dec 2018 09:01:27 -0300 Subject: [PATCH 1/3] Fixes navigation of development and operations paths * Changed navigations with broken links and also a page index. --- .../204-cluster-logging-with-EFK/readme.adoc | 2 +- .../205-cluster-autoscaling/readme.adoc | 2 +- .../304-app-scaling/readme.adoc | 2 +- .../306-app-tracing-with-jaeger-and-x-ray/readme.adoc | 2 +- .../307-app-management-with-helm/readme.adoc | 2 +- .../308-statefulsets-and-pvs/readme.adoc | 2 +- .../309-cicd-workflows/readme.adoc | 2 +- .../310-deploying-a-chart-repository/readme.adoc | 2 +- 05-path-next-steps/501-k8s-best-practices/readme.adoc | 4 ++-- developer-path.adoc | 8 ++++---- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc b/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc index 59cf792f..cd7474f9 100644 --- a/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc +++ b/02-path-working-with-clusters/204-cluster-logging-with-EFK/readme.adoc @@ -246,6 +246,6 @@ You are now ready to continue on with the workshop! [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-operations.png[link=../../02-path-working-with-clusters/204-cluster-logging-with-EFK] +|image:button-continue-operations.png[link=../../02-path-working-with-clusters/205-cluster-autoscaling] |link:../../operations-path.adoc[Go to Operations Index] |===== diff --git a/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc b/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc index 06f20445..8931e3ad 100644 --- a/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc +++ b/02-path-working-with-clusters/205-cluster-autoscaling/readme.adoc @@ -343,6 +343,6 @@ You are now ready to continue on with the workshop! [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-operations.png[link=../../02-path-working-with-clusters/205-cluster-autoscaling] +|image:button-continue-operations.png[link=../../02-path-working-with-clusters/206-cloudformation-and-terraform] |link:../../operations-path.adoc[Go to Operations Index] |===== diff --git a/03-path-application-development/304-app-scaling/readme.adoc b/03-path-application-development/304-app-scaling/readme.adoc index a5b65d4e..5941e8c8 100644 --- a/03-path-application-development/304-app-scaling/readme.adoc +++ b/03-path-application-development/304-app-scaling/readme.adoc @@ -111,7 +111,7 @@ You are now ready to continue on with the workshop! [align="center", cols="2", grid="none", frame="none"] |===== |image:button-continue-standard.png[link=../../05-path-next-steps/502-for-further-reading] -|image:button-continue-developer.png[link=../../03-path-application-development/305-app-tracing-with-jaeger-and-x-ray] +|image:button-continue-developer.png[link=../../03-path-application-development/306-app-tracing-with-jaeger-and-x-ray] |link:../../standard-path.adoc[Go to Standard Index] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/readme.adoc b/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/readme.adoc index 2619b471..45c76982 100644 --- a/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/readme.adoc +++ b/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/readme.adoc @@ -19,6 +19,6 @@ Once you've explored link:x-ray[X-Ray] and link:jaeger[Jaeger], you are ready to [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../03-path-application-development/306-app-management-with-helm] +|image:button-continue-developer.png[link=../../03-path-application-development/307-app-management-with-helm] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/03-path-application-development/307-app-management-with-helm/readme.adoc b/03-path-application-development/307-app-management-with-helm/readme.adoc index c602f87c..d7ef5c08 100644 --- a/03-path-application-development/307-app-management-with-helm/readme.adoc +++ b/03-path-application-development/307-app-management-with-helm/readme.adoc @@ -205,6 +205,6 @@ You are now ready to continue on with the workshop! [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../03-path-application-development/307-statefulsets-and-pvs] +|image:button-continue-developer.png[link=../../03-path-application-development/308-statefulsets-and-pvs] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/03-path-application-development/308-statefulsets-and-pvs/readme.adoc b/03-path-application-development/308-statefulsets-and-pvs/readme.adoc index 4f6c78a8..e2ca276b 100644 --- a/03-path-application-development/308-statefulsets-and-pvs/readme.adoc +++ b/03-path-application-development/308-statefulsets-and-pvs/readme.adoc @@ -513,6 +513,6 @@ You are now ready to continue on with the workshop! [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../03-path-application-development/308-cicd-workflows/] +|image:button-continue-developer.png[link=../../03-path-application-development/311-chaos-engineering/] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/03-path-application-development/309-cicd-workflows/readme.adoc b/03-path-application-development/309-cicd-workflows/readme.adoc index 2217942a..f7a3457a 100644 --- a/03-path-application-development/309-cicd-workflows/readme.adoc +++ b/03-path-application-development/309-cicd-workflows/readme.adoc @@ -18,6 +18,6 @@ Once you've looked at the options above, you are ready to continue with the work [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../03-path-application-development/309-deploying-a-chart-repository] +|image:button-continue-developer.png[link=../../03-path-application-development/310-deploying-a-chart-repository] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/03-path-application-development/310-deploying-a-chart-repository/readme.adoc b/03-path-application-development/310-deploying-a-chart-repository/readme.adoc index edb8e4d9..b7253470 100644 --- a/03-path-application-development/310-deploying-a-chart-repository/readme.adoc +++ b/03-path-application-development/310-deploying-a-chart-repository/readme.adoc @@ -424,6 +424,6 @@ You are now ready to continue on with the workshop! [align="center", cols="1", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../03-path-application-development/310-chaos-engineering] +|image:button-continue-developer.png[link=../../03-path-application-development/311-chaos-engineering] |link:../../developer-path.adoc[Go to Developer Index] |===== diff --git a/05-path-next-steps/501-k8s-best-practices/readme.adoc b/05-path-next-steps/501-k8s-best-practices/readme.adoc index 5ac8a942..dcf3b92a 100644 --- a/05-path-next-steps/501-k8s-best-practices/readme.adoc +++ b/05-path-next-steps/501-k8s-best-practices/readme.adoc @@ -120,8 +120,8 @@ You are now ready to continue on with the workshop! [align="center", cols="2", grid="none", frame="none"] |===== -|image:button-continue-developer.png[link=../../05-path-next-steps/501-k8s-best-practices/] -|image:button-continue-operations.png[link=../../05-path-next-steps/501-k8s-best-practices/] +|image:button-continue-developer.png[link=../../05-path-next-steps/502-for-further-reading/] +|image:button-continue-operations.png[link=../../05-path-next-steps/502-for-further-reading/] |link:../../developer-path.adoc[Go to Developer Index] |link:../../operations-path.adoc[Go to Operations Index] |===== diff --git a/developer-path.adoc b/developer-path.adoc index d39ce152..480448d1 100644 --- a/developer-path.adoc +++ b/developer-path.adoc @@ -24,10 +24,10 @@ This path is suitable for individual developers or development teams interested |link:03-path-application-development/302-app-discovery[302: Service Discovery for Microservices] |link:03-path-application-development/303-app-update[303: Updating Applications on Kubernetes] |link:03-path-application-development/304-app-scaling[304: Scaling Applications on Kubernetes] -|link:03-path-application-development/305-app-tracing-with-jaeger-and-x-ray[305: Tracing Applications with Jaeger and X-Ray] -|link:03-path-application-development/306-app-management-with-helm[306: Manage Applications with Helm] -|link:03-path-application-development/307-statefulsets-and-pvs[307: Store Persistent Data with StatefulSets and PVs] -|link:03-path-application-development/310-chaos-engineering[310: Applying Chaos Engineering] +|link:03-path-application-development/306-app-tracing-with-jaeger-and-x-ray[306: Tracing Applications with Jaeger and X-Ray] +|link:03-path-application-development/307-app-management-with-helm[307: Manage Applications with Helm] +|link:03-path-application-development/308-statefulsets-and-pvs[308: Store Persistent Data with StatefulSets and PVs] +|link:03-path-application-development/311-chaos-engineering[311: Applying Chaos Engineering] |link:04-path-security-and-networking/401-configmaps-and-secrets[401: ConfigMaps and Secrets] |link:04-path-security-and-networking/402-authentication-and-authorization[402: Authentication, Authorization, and Access] |link:04-path-security-and-networking/403-admission-policy[403: Admission Control for Kubernetes on AWS] From f163d72c82ae5fff3a961c1109be4f7f69dbda3a Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Sat, 15 Dec 2018 10:04:12 -0300 Subject: [PATCH 2/3] Fixes broken links on prerequisites * Fixes issues #559 and #411 --- .../203-cluster-upgrades/readme.adoc | 2 +- .../306-app-tracing-with-jaeger-and-x-ray/jaeger/readme.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc b/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc index 07ed1a09..b97e8569 100644 --- a/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc +++ b/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc @@ -14,7 +14,7 @@ with 1.6.10 version and perform an automatic rolling upgrade to 1.7.2 using kops === Create cluster -Review steps to create link:../prereqs.adoc[prereqs] and make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. More details about creating a cluster are at link:../cluster-install[Create Kubernetes cluster using kops]. +Review steps to link:../../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[Create Kubernetes cluster using kops] and make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. In this chapter, we'll create a Kubernetes 1.6.10 version cluster as shown: diff --git a/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/jaeger/readme.adoc b/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/jaeger/readme.adoc index bd0a329c..431e0263 100644 --- a/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/jaeger/readme.adoc +++ b/03-path-application-development/306-app-tracing-with-jaeger-and-x-ray/jaeger/readme.adoc @@ -17,9 +17,9 @@ In September 2017, Jaeger became a member of the link:https://www.cncf.io/[CNCF] == Pre-requisites -A 3 master nodes and 5 worker nodes cluster as explained at link:../cluster-install#multi-master-multi-node-multi-az-gossip-based-cluster[] is used for this chapter. +A 3 master nodes and 5 worker nodes cluster as explained at link:../../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[Create a Kubernetes Cluster with kops] is used for this chapter. -We will use the Istio service mesh sample application, so follow these steps to link:../../service-mesh#install-istio[install istio] and link:../../service-mesh#deploying-the-sample-application[deploy the sample application]. +We will use the Istio service mesh sample application, so follow these steps to link:../../../02-path-working-with-clusters/202-service-mesh#install-istio[install istio] and link:../../../02-path-working-with-clusters/202-service-mesh#deploying-the-sample-application[deploy the sample application]. Check that you can see the BookInfo product page in your browser, as seen below. image::bookinfo.png[] From edb29e091509152025709cf06100fc1cd3a28453 Mon Sep 17 00:00:00 2001 From: Lucas Alves Date: Sat, 15 Dec 2018 10:29:36 -0300 Subject: [PATCH 3/3] Fixes links on Create cluster prereqs --- .../203-cluster-upgrades/readme.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc b/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc index b97e8569..0c77d3a6 100644 --- a/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc +++ b/02-path-working-with-clusters/203-cluster-upgrades/readme.adoc @@ -14,7 +14,9 @@ with 1.6.10 version and perform an automatic rolling upgrade to 1.7.2 using kops === Create cluster -Review steps to link:../../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[Create Kubernetes cluster using kops] and make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. +Review steps to create link:../../01-path-basics/101-start-here#install-kops[prereqs] and make sure `KOPS_STATE_STORE` and `AWS_AVAILABILITY_ZONES` environment variables are set. +More details about creating a cluster are at link:../../01-path-basics/102-your-first-cluster#alternative-create-a-kubernetes-cluster-with-kops[Create Kubernetes cluster using kops]. + In this chapter, we'll create a Kubernetes 1.6.10 version cluster as shown: