Merge pull request aws-samples#455 from den-is/master

use stable api versions for resource which have been promoted to GA

Author: Christopher Hein

01-path-basics/103-kubernetes-concepts/readme.adoc

@@ -542,12 +542,15 @@ A "`desired state`", such as 4 replicas of a pod, can be described in a Deployme
 The folowing example will create a Deployment with 3 replicas of NGINX base image. Let's begin with the template:
 
   $ cat deployment.yaml
-	apiVersion: extensions/v1beta1
+	apiVersion: apps/v1
 	kind: Deployment # kubernetes object type
 	metadata:
 	  name: nginx-deployment # deployment name
 	spec:
 	  replicas: 3 # number of replicas
+	  selector:
+	    matchLabels:
+	      app: nginx
 	  template:
 	    metadata:
 	      labels:
@@ -723,12 +726,15 @@ Pods belong to a service by using a loosely-coupled model where labels are attac
 Let's create a Deployment first that will create 3 replicas of a pod:
 
   $ cat echo-deployment.yaml
-	apiVersion: extensions/v1beta1
+	apiVersion: apps/v1
 	kind: Deployment
 	metadata:
 	  name: echo-deployment
 	spec:
 	  replicas: 3
+	  selector:
+	    matchLabels:
+	      app: echo-pod
 	  template:
 	    metadata:
 	      labels:
@@ -940,6 +946,10 @@ The folowing is an example DaemonSet that runs a Prometheus container. Let's beg
 	metadata:
 	  name: prometheus-daemonset
 	spec:
+	  selector:
+	    matchLabels:
+	      tier: monitoring
+	      name: prometheus-exporter
 	  template:
 	    metadata:
 	      labels:
@@ -1407,6 +1417,9 @@ No resource limits.
 	  namespace: dev
 	spec:
 	  replicas: 3
+	  selector:
+	    matchLabels:
+	      app: nginx
 	  template:
 	    metadata:
 	      labels:

01-path-basics/103-kubernetes-concepts/templates/daemonset.yaml

@@ -1,8 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: prometheus-daemonset
 spec:
+  selector:
+    matchLabels:
+      tier: monitoring
+      name: prometheus-exporter
   template:
     metadata:
       labels:
@@ -13,4 +17,4 @@ spec:
       - name: prometheus
         image: prom/node-exporter
         ports:
-        - containerPort: 80
+        - containerPort: 80

01-path-basics/103-kubernetes-concepts/templates/deployment-namespace.yaml

@@ -1,18 +1,21 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment-ns
   namespace: dev
 spec:
-  replicas: 3 
+  replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
-        app: nginx 
+        app: nginx
     spec:
       containers:
-      - name: nginx 
+      - name: nginx
         image: nginx:1.12.1
-        ports: 
+        ports:
         - containerPort: 80
         - containerPort: 443

01-path-basics/103-kubernetes-concepts/templates/deployment.yaml

@@ -1,17 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
 spec:
-  replicas: 3 
+  replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
-        app: nginx 
+        app: nginx
     spec:
       containers:
-      - name: nginx 
+      - name: nginx
         image: nginx:1.12.1
-        ports: 
+        ports:
         - containerPort: 80
         - containerPort: 443

01-path-basics/103-kubernetes-concepts/templates/echo-deployment.yaml

@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: echo-deployment
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: echo-pod
   template:
     metadata:
       labels:

01-path-basics/103-kubernetes-concepts/templates/echo.yaml

@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: echo-deployment
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: echo-pod
   template:
     metadata:
       labels:

01-path-basics/103-kubernetes-concepts/templates/replicaset.yaml

@@ -1,17 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: nginx-replicaset
 spec:
-  replicas: 3 
+  replicas: 3
+  selector:
+    matchLabels:
+      name: nginx-replica
   template:
     metadata:
       labels:
         name: nginx-replica
     spec:
       containers:
-      - name: nginx-replica 
-        image: nginx:1.12.1 
+      - name: nginx-replica
+        image: nginx:1.12.1
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/grafana.yaml

@@ -1,10 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: monitoring-grafana
   namespace: kube-system
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      task: monitoring
+      k8s-app: grafana
   template:
     metadata:
       labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster-rbac.yaml

@@ -1,5 +1,5 @@
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: heapster
 roleRef:

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster.yaml

@@ -4,13 +4,17 @@ metadata:
   name: heapster
   namespace: kube-system
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: heapster
   namespace: kube-system
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      task: monitoring
+      k8s-app: heapster
   template:
     metadata:
       labels: