Merge pull request kubernetes#638 from pwittrock/b2

Book: update labeling recommendations
wking · Apr 4, 2019 · 3a15b06 · 3a15b06
2 parents 1a9b8b0 + 588ebd7
commit 3a15b06
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/docs/book/pages/app_management/labels_and_annotations.md b/docs/book/pages/app_management/labels_and_annotations.md
@@ -95,15 +95,11 @@ labels.  e.g. the selectors for Services in the project will be updated to inclu
 *in addition* to the other labels.
 {% endpanel %}
 
-{% panel style="success", title="Effective Labeling Strategies" %}
-A common practice is to label Resources with metadata about the environment, application,
-tier and version.  Labeling Workload Resources makes it simpler to query Pods - e.g. for the
-purpose of getting their logs.
-
-- `app=nginx`
-- `tier=frontend`
-- `env=prod`
-- `version=1.16`
+{% panel style="success", title="Common Labels" %}
+The k8s.io documentation defines a set of [Common Labeling Conventions](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/)
+that may be applied to Applications.
+
+Labeling Workload Resources makes it simpler to query Pods - e.g. for the purpose of getting their logs.
 
 {% endpanel %}