Fix deployments until next release (#3142)

deploy/configmap.yaml

@@ -1,5 +1,3 @@
----
-
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -7,3 +5,7 @@ metadata:
   namespace: ingress-nginx
   labels:
     app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+
+---
+

deploy/default-backend.yaml

@@ -1,5 +1,3 @@
----
-
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -43,8 +41,8 @@ spec:
             requests:
               cpu: 10m
               memory: 20Mi
----
 
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -60,3 +58,6 @@ spec:
   selector:
     app.kubernetes.io/name: default-http-backend
     app.kubernetes.io/part-of: ingress-nginx
+
+---
+

deploy/mandatory.yaml

@@ -1,11 +1,72 @@
----
-
 apiVersion: v1
 kind: Namespace
 metadata:
   name: ingress-nginx
+
 ---
 
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: default-http-backend
+  labels:
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
+  namespace: ingress-nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: default-http-backend
+      app.kubernetes.io/part-of: ingress-nginx
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: default-http-backend
+        app.kubernetes.io/part-of: ingress-nginx
+    spec:
+      terminationGracePeriodSeconds: 60
+      containers:
+        - name: default-http-backend
+          # Any image is permissible as long as:
+          # 1. It serves a 404 page at /
+          # 2. It serves 200 on a /healthz endpoint
+          image: gcr.io/google_containers/defaultbackend:1.4
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 30
+            timeoutSeconds: 5
+          ports:
+            - containerPort: 8080
+          resources:
+            limits:
+              cpu: 10m
+              memory: 20Mi
+            requests:
+              cpu: 10m
+              memory: 20Mi
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: default-http-backend
+  namespace: ingress-nginx
+  labels:
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
+spec:
+  ports:
+    - port: 80
+      targetPort: 8080
+  selector:
+    app.kubernetes.io/name: default-http-backend
+    app.kubernetes.io/part-of: ingress-nginx
+
+---
 
 kind: ConfigMap
 apiVersion: v1
@@ -15,6 +76,7 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
 ---
 
 kind: ConfigMap
@@ -25,6 +87,7 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
 ---
 
 kind: ConfigMap
@@ -35,6 +98,7 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
 ---
 
 apiVersion: v1
@@ -47,7 +111,6 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
@@ -104,7 +167,6 @@ rules:
       - update
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
@@ -150,7 +212,6 @@ rules:
       - get
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
@@ -169,7 +230,6 @@ subjects:
     namespace: ingress-nginx
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
@@ -185,6 +245,7 @@ subjects:
   - kind: ServiceAccount
     name: nginx-ingress-serviceaccount
     namespace: ingress-nginx
+
 ---
 
 apiVersion: extensions/v1beta1
@@ -207,8 +268,8 @@ spec:
         app.kubernetes.io/name: ingress-nginx
         app.kubernetes.io/part-of: ingress-nginx
       annotations:
-        prometheus.io/port: '10254'
+        prometheus.io/port: "10254"
-        prometheus.io/scrape: 'true'
+        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
@@ -216,6 +277,7 @@ spec:
           image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.19.0
           args:
             - /nginx-ingress-controller
+            - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
             - --configmap=$(POD_NAMESPACE)/nginx-configuration
             - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
             - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
@@ -262,3 +324,5 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+
+---

deploy/monitoring/configuration.yaml

@@ -40,3 +40,6 @@ data:
       - source_labels: [__meta_kubernetes_service_name]
         regex: prometheus-server
         action: drop
+
+---
+

deploy/monitoring/grafana.yaml

@@ -45,7 +45,6 @@ spec:
           name: data
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -64,3 +63,6 @@ spec:
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: ingress-nginx
   type: NodePort
+
+---
+

deploy/monitoring/prometheus.yaml

@@ -15,7 +15,6 @@ rules:
     verbs: ["get", "list", "watch"]
 
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -26,7 +25,6 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -46,7 +44,6 @@ subjects:
     namespace: ingress-nginx
 
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -90,7 +87,6 @@ spec:
           emptyDir: {}
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -108,3 +104,6 @@ spec:
   ports:
     - port: 9090
       targetPort: 9090
+
+---
+

deploy/namespace.yaml

@@ -1,6 +1,7 @@
----
-
 apiVersion: v1
 kind: Namespace
 metadata:
   name: ingress-nginx
+
+---
+

deploy/provider/aws/patch-configmap-l7.yaml

@@ -8,3 +8,6 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
 data:
   use-proxy-protocol: "false"
+
+---
+

deploy/provider/aws/service-l4.yaml

@@ -8,11 +8,11 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
   annotations:
     # Enable PROXY protocol
-    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'
+    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
     # Ensure the ELB idle timeout is less than nginx keep-alive timeout. By default,
     # NGINX keep-alive is set to 75s. If using WebSockets, the value will need to be
     # increased to '3600' to avoid any potential issues.
-    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '60'
+    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "60"
 spec:
   type: LoadBalancer
   selector:
@@ -25,3 +25,6 @@ spec:
     - name: https
       port: 443
       targetPort: https
+
+---
+

deploy/provider/aws/service-l7.yaml

@@ -16,7 +16,7 @@ metadata:
     # Ensure the ELB idle timeout is less than nginx keep-alive timeout. By default,
     # NGINX keep-alive is set to 75s. If using WebSockets, the value will need to be
     # increased to '3600' to avoid any potential issues.
-    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '60'
+    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "60"
 spec:
   type: LoadBalancer
   selector:
@@ -29,3 +29,6 @@ spec:
     - name: https
       port: 443
       targetPort: http
+
+---
+

deploy/provider/aws/service-nlb.yaml

@@ -23,3 +23,6 @@ spec:
     - name: https
       port: 443
       targetPort: https
+
+---
+

deploy/provider/baremetal/service-nodeport.yaml

@@ -20,3 +20,6 @@ spec:
   selector:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
+---
+

deploy/provider/cloud-generic.yaml

@@ -19,3 +19,6 @@ spec:
     - name: https
       port: 443
       targetPort: https
+
+---
+

deploy/rbac.yaml

@@ -1,17 +1,20 @@
----
-
 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:
       - ""
@@ -61,12 +64,14 @@ rules:
       - update
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 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:
       - ""
@@ -104,12 +109,14 @@ rules:
       - get
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 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
@@ -120,11 +127,13 @@ subjects:
     namespace: ingress-nginx
 
 ---
-
 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
@@ -133,3 +142,6 @@ subjects:
   - kind: ServiceAccount
     name: nginx-ingress-serviceaccount
     namespace: ingress-nginx
+
+---
+

deploy/tcp-services-configmap.yaml

@@ -1,5 +1,3 @@
----
-
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -8,3 +6,6 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
+---
+

deploy/udp-services-configmap.yaml

@@ -1,5 +1,3 @@
----
-
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -8,3 +6,6 @@ metadata:
   labels:
     app.kubernetes.io/name: ingress-nginx
     app.kubernetes.io/part-of: ingress-nginx
+
+---
+

deploy/with-rbac.yaml

@@ -1,5 +1,3 @@
----
-
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -20,8 +18,8 @@ spec:
         app.kubernetes.io/name: ingress-nginx
         app.kubernetes.io/part-of: ingress-nginx
       annotations:
-        prometheus.io/port: '10254'
+        prometheus.io/port: "10254"
-        prometheus.io/scrape: 'true'
+        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
@@ -76,3 +74,6 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+
+---
+