diff --git a/cmd/kinflate/longerDemo/base.md b/cmd/kinflate/longerDemo/base.md index ec6e14f14..f2188f97f 100644 --- a/cmd/kinflate/longerDemo/base.md +++ b/cmd/kinflate/longerDemo/base.md @@ -8,6 +8,11 @@ apply it to your cluster. kubectl apply -f $TUT_APP ``` + +``` +kubectl get deployments +``` + Define some functions to query the server directly: diff --git a/cmd/kinflate/longerDemo/customization.md b/cmd/kinflate/longerDemo/customization.md index a399c9b0e..88c9c747b 100644 --- a/cmd/kinflate/longerDemo/customization.md +++ b/cmd/kinflate/longerDemo/customization.md @@ -8,21 +8,16 @@ of `Kube-manifest.yaml`. ## Names The simplest form of customization is to change -resource names. In DAM, this is done by adding a -prefix. +resource names. -Be sure the manifest is in original form: - -``` -cp $TUT_ORG_MANIFEST $TUT_APP_MANIFEST -``` +In DAM, this is done by adding a +prefix. Add a _namePrefix_ specification to the manifest: ``` cd $TUT_APP kinflate setnameprefix acme- -# echo "namePrefix: acme-" >> $TUT_APP_MANIFEST ``` Run it: @@ -69,5 +64,5 @@ its resources into her version control repository. It becomes her own version of the _app_. -She can capture upgrades (manifest and resource +She can capture upgrades (i.e. manifest and resource changes) by rebasing from the original. diff --git a/cmd/kinflate/longerDemo/editor.md b/cmd/kinflate/longerDemo/editor.md index 18c7d7037..fdef012c2 100644 --- a/cmd/kinflate/longerDemo/editor.md +++ b/cmd/kinflate/longerDemo/editor.md @@ -44,6 +44,11 @@ data: EOF ``` + +``` +ls +``` + Add it to the manifest: diff --git a/cmd/kinflate/longerDemo/instances/README.md b/cmd/kinflate/longerDemo/instances/README.md index e7646340f..55150a5be 100644 --- a/cmd/kinflate/longerDemo/instances/README.md +++ b/cmd/kinflate/longerDemo/instances/README.md @@ -15,10 +15,9 @@ and optionally more (or fewer) resources. Create a _staging_ and _production_ instance. - * The greetings from the web server will differ. - * In staging we'll enable a risky feature. - * Production will have a higher replica count because - it takes public traffic. + * The greetings from the _hello world_ web servers will differ. + * _Staging_ enables a risky feature (for testing). + * _Production_ has a higher replica count. ``` diff --git a/cmd/kinflate/longerDemo/instances/compare.md b/cmd/kinflate/longerDemo/instances/compare.md index 8835110fa..6e2e51318 100644 --- a/cmd/kinflate/longerDemo/instances/compare.md +++ b/cmd/kinflate/longerDemo/instances/compare.md @@ -1,8 +1,15 @@ # Compare them -Review the instance differences: +Before running kinflate on the two different instance +directories, review the directory +structure: - + +``` +find $TUT_APP +``` + + ``` diff \ <(kinflate inflate -f $TUT_APP/staging) \ @@ -36,13 +43,22 @@ kinflate inflate -f $TUT_APP/production |\ kubectl apply -f - ``` -Query them: + +``` +kubectl get all +``` - +Delete the resources: + + ``` -tut_query staging-acme-tut-service pear +kubectl delete configmap staging-acme-tut-map +kubectl delete service staging-acme-tut-service +kubectl delete deployment staging-acme-tut-deployment ``` - + + ``` -tut_query production-acme-tut-service apple +kinflate inflate -f $TUT_APP/production |\ + kubectl delete -f - ``` diff --git a/cmd/kinflate/longerDemo/instances/production.md b/cmd/kinflate/longerDemo/instances/production.md index 55aba2bee..ebb6977ae 100644 --- a/cmd/kinflate/longerDemo/instances/production.md +++ b/cmd/kinflate/longerDemo/instances/production.md @@ -20,7 +20,7 @@ objectLabels: org: acmeCorporation objectAnnotations: - note: Hello there I am production! + note: Hello, I am production! resources: - .. diff --git a/cmd/kinflate/longerDemo/instances/staging.md b/cmd/kinflate/longerDemo/instances/staging.md index 93329c5b0..808ead00b 100644 --- a/cmd/kinflate/longerDemo/instances/staging.md +++ b/cmd/kinflate/longerDemo/instances/staging.md @@ -20,7 +20,7 @@ objectLabels: org: acmeCorporation objectAnnotations: - note: Hello there I am staging! + note: Hello, I am staging! resources: - ..