Merge pull request #2970 from ant31/labels

Update labels
kubernetes · Aug 22, 2018 · a2e8bd8 · a2e8bd8
2 parents a426fba + 0a88be3
commit a2e8bd8
Show file tree

Hide file tree

Showing 16 changed files with 122 additions and 40 deletions.
diff --git a/deploy/configmap.yaml b/deploy/configmap.yaml
@@ -6,4 +6,4 @@ metadata:
   name: nginx-configuration
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml
@@ -5,17 +5,18 @@ kind: Deployment
 metadata:
   name: default-http-backend
   labels:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
   namespace: ingress-nginx
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: default-http-backend
+      app.kubernetes.io/name: default-http-backend
   template:
     metadata:
       labels:
-        app: default-http-backend
+        app.kubernetes.io/name: default-http-backend
     spec:
       terminationGracePeriodSeconds: 60
       containers:
@@ -48,10 +49,11 @@ metadata:
   name: default-http-backend
   namespace: ingress-nginx
   labels:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   ports:
   - port: 80
     targetPort: 8080
   selector:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
diff --git a/deploy/mandatory.yaml b/deploy/mandatory.yaml
@@ -11,17 +11,19 @@ kind: Deployment
 metadata:
   name: default-http-backend
   labels:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
   namespace: ingress-nginx
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: default-http-backend
+      app.kubernetes.io/name: default-http-backend
   template:
     metadata:
       labels:
-        app: default-http-backend
+        app.kubernetes.io/name: default-http-backend
+        app.kubernetes.io/part-of: ingress-nginx
     spec:
       terminationGracePeriodSeconds: 60
       containers:
@@ -54,13 +56,14 @@ metadata:
   name: default-http-backend
   namespace: ingress-nginx
   labels:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   ports:
   - port: 80
     targetPort: 8080
   selector:
-    app: default-http-backend
+    app.kubernetes.io/name: default-http-backend
 ---
 
 kind: ConfigMap
@@ -69,35 +72,48 @@ metadata:
   name: nginx-configuration
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 ---
 
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: tcp-services
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 ---
 
 kind: ConfigMap
 apiVersion: v1
 metadata:
   name: udp-services
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 ---
 
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: nginx-ingress-serviceaccount
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: nginx-ingress-clusterrole
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 rules:
   - apiGroups:
       - ""
@@ -153,6 +169,9 @@ kind: Role
 metadata:
   name: nginx-ingress-role
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 rules:
   - apiGroups:
       - ""
@@ -196,6 +215,9 @@ kind: RoleBinding
 metadata:
   name: nginx-ingress-role-nisa-binding
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -211,6 +233,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: nginx-ingress-clusterrole-nisa-binding
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -225,16 +250,19 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: nginx-ingress-controller
-  namespace: ingress-nginx 
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ingress-nginx
+      app.kubernetes.io/name: ingress-nginx
   template:
     metadata:
       labels:
-        app: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
       annotations:
         prometheus.io/port: '10254'
         prometheus.io/scrape: 'true'

diff --git a/deploy/monitoring/configuration.yaml b/deploy/monitoring/configuration.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: prometheus-configuration
   labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
     name: prometheus-configuration
   namespace: ingress-nginx
 data:
@@ -38,4 +40,3 @@ data:
       - source_labels: [__meta_kubernetes_service_name]
         regex: prometheus-service
         action: drop
- 
diff --git a/deploy/monitoring/grafana.yaml b/deploy/monitoring/grafana.yaml
@@ -2,13 +2,16 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
-    name: grafana
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: ingress-nginx
+
   name: grafana
   namespace: ingress-nginx
 spec:
   selector:
     matchLabels:
-      app: grafana
+      app.kubernetes.io/name: grafana
+      app.kubernetes.io/part-of: ingress-nginx
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -17,7 +20,8 @@ spec:
   template:
     metadata:
       labels:
-        app: grafana
+        app.kubernetes.io/name: grafana
+        app.kubernetes.io/part-of: ingress-nginx
     spec:
       containers:
       - image: grafana/grafana
@@ -47,11 +51,16 @@ kind: Service
 metadata:
   name: grafana
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: ingress-nginx
+
 spec:
   ports:
   - port: 3000
     protocol: TCP
     targetPort: 3000
   selector:
-    app: grafana
-  type: NodePort
+    app.kubernetes.io/name: grafana
+    app.kubernetes.io/part-of: ingress-nginx
+  type: NodePort
diff --git a/deploy/monitoring/prometheus.yaml b/deploy/monitoring/prometheus.yaml
@@ -3,9 +3,12 @@ kind: Role
 metadata:
   name: prometheus-server
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
 rules:
 - apiGroups: [""]
-  resources: 
+  resources:
   - services
   - endpoints
   - pods
@@ -18,6 +21,9 @@ kind: ServiceAccount
 metadata:
   name: prometheus-server
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
 
 ---
 
@@ -26,6 +32,10 @@ kind: RoleBinding
 metadata:
   name: prometheus-server
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
+
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -42,15 +52,21 @@ kind: Deployment
 metadata:
   name: prometheus-server
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
+
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: prometheus-server
+      app.kubernetes.io/name: prometheus
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
-        app: prometheus-server
+        app.kubernetes.io/name: prometheus
+        app.kubernetes.io/part-of: ingress-nginx
     spec:
       serviceAccountName: prometheus-server
       containers:
@@ -80,9 +96,14 @@ kind: Service
 metadata:
   name: prometheus-service
   namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
+
 spec:
   selector:
-    app: prometheus-server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/part-of: ingress-nginx
   type: NodePort
   ports:
     - port: 9090

diff --git a/deploy/provider/aws/patch-configmap-l4.yaml b/deploy/provider/aws/patch-configmap-l4.yaml
@@ -4,6 +4,7 @@ metadata:
   name: nginx-configuration
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 data:
   use-proxy-protocol: "true"
diff --git a/deploy/provider/aws/patch-configmap-l7.yaml b/deploy/provider/aws/patch-configmap-l7.yaml
@@ -4,6 +4,7 @@ metadata:
   name: nginx-configuration
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 data:
   use-proxy-protocol: "false"
diff --git a/deploy/provider/aws/service-l4.yaml b/deploy/provider/aws/service-l4.yaml
@@ -4,7 +4,8 @@ metadata:
   name: ingress-nginx
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   annotations:
     # Enable PROXY protocol
     service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
@@ -13,7 +14,7 @@ metadata:
 spec:
   type: LoadBalancer
   selector:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
   ports:
   - name: http
     port: 80

diff --git a/deploy/provider/aws/service-l7.yaml b/deploy/provider/aws/service-l7.yaml
@@ -4,10 +4,11 @@ metadata:
   name: ingress-nginx
   namespace: ingress-nginx
   labels:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
   annotations:
     # replace with the correct value of the generated certificate in the AWS console
-    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-west-2:XXXXXXXX:certificate/XXXXXX-XXXXXXX-XXXXXXX-XXXXXXXX" 
+    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-west-2:XXXXXXXX:certificate/XXXXXX-XXXXXXX-XXXXXXX-XXXXXXXX"
     # the backend instances are HTTP
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "http"
     # Map port 443
@@ -17,7 +18,7 @@ metadata:
 spec:
   type: LoadBalancer
   selector:
-    app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
   ports:
   - name: http
     port: 80