Update the kubectl/yaml style deployment config for k8s 1.22.

deploy/rbac-controller.yaml

 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: viking.uplex.de:controller
 rules:
@@ -28,7 +28,7 @@ rules:
   - create
   - patch
 - apiGroups:
-  - extensions
+  - networking.k8s.io
   resources:
   - ingresses
   verbs:
@@ -36,7 +36,7 @@ rules:
   - watch
   - get
 - apiGroups:
-  - "extensions"
+  - "networking.k8s.io"
   resources:
   - ingresses/status
   verbs:
@@ -59,7 +59,7 @@ rules:
   - update
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-controller
 subjects:

deploy/rbac-varnish.yaml

 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress
 rules:
@@ -13,7 +13,7 @@ rules:
   - watch
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress
 subjects:

docs/ref-svcs-ingresses-ns.md

@@ -26,7 +26,7 @@ both their rules and these two annotations:
 For example:
 
 ```
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: coffee-ingress

examples/architectures/cluster-and-ns-wide/coffee-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: coffee-ingress
@@ -11,5 +11,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/cluster-and-ns-wide/other-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: other-ingress
@@ -7,6 +7,8 @@ metadata:
     kubernetes.io/ingress.class: "varnish"
     ingress.varnish-cache.org/varnish-svc: "kube-system/varnish-ingress-admin"
 spec:
-  backend:
-    serviceName: other-svc
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: other-svc
+      port:
+        number: 80

examples/architectures/cluster-and-ns-wide/rbac.yaml

@@ -35,7 +35,7 @@ metadata:
   namespace: kube-system
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-system
   namespace: kube-system
@@ -55,7 +55,7 @@ metadata:
   namespace: cafe
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-cafe
   namespace: cafe

examples/architectures/cluster-and-ns-wide/tea-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: tea-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/clusterwide/coffee-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: coffee-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/clusterwide/other-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: other-ingress
@@ -7,6 +7,8 @@ metadata:
     kubernetes.io/ingress.class: "varnish"
     ingress.varnish-cache.org/varnish-svc: "kube-system/varnish-ingress-admin"
 spec:
-  backend:
-    serviceName: other-svc
-    servicePort: 80
+  defaultBackend:
+    service:
+      name: other-svc
+      port:
+        number: 80

examples/architectures/clusterwide/rbac.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: kube-system
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-system
   namespace: kube-system

examples/architectures/clusterwide/tea-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: tea-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/multi-controller/coffee-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: coffee-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/multi-controller/rbac.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: cafe
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-cafe
   namespace: cafe

examples/architectures/multi-controller/tea-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: tea-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/multi-varnish-ns/coffee-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: coffee-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/architectures/multi-varnish-ns/rbac.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: cafe
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: varnish-ingress-cafe
   namespace: cafe

examples/architectures/multi-varnish-ns/tea-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: tea-ingress
@@ -12,5 +12,8 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
+        pathType: ImplementationSpecific

examples/externalname/backend-cfg.yaml

@@ -60,7 +60,9 @@ spec:
   #   outstanding DNS queries. Queries above the limit are queued.
   # - followDNSRedirects (boolean): whether DNS queries follow redirects
   #   (CNAME and DNAME). Default true
-  dnsRetryDelay: 20s
+  nameTtl:
+    ttl: 1s
+    from: min
   domainUsageTimeout: 1h
   firstLookupTimeout: 15s
   resolverTimeout: 45s
@@ -96,7 +98,9 @@ spec:
     window: 4
     threshold: 3
   # Configuration specific to ExternalName Services
-  dnsRetryDelay: 25s
+  nameTtl:
+    ttl: 1s
+    from: cfg
   domainUsageTimeout: 3h
   firstLookupTimeout: 20s
   resolverTimeout: 1m

examples/externalname/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -10,10 +10,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-external-svc
-          servicePort: 81
+          service:
+            name: tea-external-svc
+            port:
+              number: 81
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-external-svc
-          servicePort: 80
+          service:
+            name: coffee-external-svc
+            port:
+              number: 80

examples/file-cache/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress
@@ -11,10 +11,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

examples/hello/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -10,10 +10,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

examples/namespace/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -11,10 +11,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

examples/namespace/rbac.yaml

@@ -28,7 +28,7 @@ rules:
       - create
       - patch
   - apiGroups:
-      - extensions
+      - networking.k8s.io
     resources:
       - ingresses
     verbs:
@@ -36,7 +36,7 @@ rules:
       - watch
       - get
   - apiGroups:
-      - "extensions"
+      - networking.k8s.io
     resources:
       - ingresses/status
     verbs:
@@ -86,7 +86,7 @@ metadata:
   namespace: varnish-ingress
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: varnish-ingress
   name: viking-controller-ns-example
@@ -100,7 +100,7 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: varnish-ingress
   name: viking-service-ns-example

examples/req-disposition/alt-builtin.yaml

@@ -28,7 +28,7 @@ spec:
         values:
           - HTTP/1.1
         match-flags:
-          case-insensitive: true
+          case-sensitive: false
       disposition:
         action: synth
         status: 400

examples/tls/hello/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -14,10 +14,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

examples/tls/onload/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -10,10 +10,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-external-svc
-          servicePort: 4443
+          service:
+            name: coffee-external-svc
+            port:
+              number: 4443

examples/tls/sni/beverage-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -17,21 +17,33 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80
   - host: bar.example.com
     http:
       paths:
       - path: /vodka
+        pathType: ImplementationSpecific
         backend:
-          serviceName: vodka-svc
-          servicePort: 80
+          service:
+            name: vodka-svc
+            port:
+              number: 80
       - path: /whiskey
+        pathType: ImplementationSpecific
         backend:
-          serviceName: whiskey-svc
-          servicePort: 80
+          service:
+            name: whiskey-svc
+            port:
+              number: 80

examples/varnish_pod_template/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -11,10 +11,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

test/e2e/deleteTLSsecret/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cafe-ingress-varnish
@@ -14,10 +14,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

test/e2e/tmplcfg/cafe-ingress.yaml

-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: dev
@@ -11,10 +11,16 @@ spec:
     http:
       paths:
       - path: /tea
+        pathType: ImplementationSpecific
         backend:
-          serviceName: tea-svc
-          servicePort: 80
+          service:
+            name: tea-svc
+            port:
+              number: 80
       - path: /coffee
+        pathType: ImplementationSpecific
         backend:
-          serviceName: coffee-svc
-          servicePort: 80
+          service:
+            name: coffee-svc
+            port:
+              number: 80

test/e2e/tmplcfg/rbac.yaml

@@ -100,7 +100,7 @@ metadata:
   namespace: dev
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: dev
   name: viking-controller-devmode-example
@@ -114,7 +114,7 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: dev
   name: viking-service-devmode-example