Merge branch 'master' into kolja/ingress_networking_api_update

Author: ianmiell

.github/workflows/test.yml

@@ -9,18 +9,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: install kubeval
+      - name: install kubeconform
         run: |
-           curl -L https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz | tar -zxf -
-           sudo mv kubeval /usr/local/bin
+           curl -L https://github.com/yannh/kubeconform/releases/latest/download/kubeconform-linux-amd64.tar.gz | tar -zxf -
+           sudo mv kubeconform /usr/local/bin
+           kubeconform -v
       - name: check all yaml
         run: |
-          comm -3 <(find . | grep yaml$ | sort) <(cat .kubeval-ignore | sort) | xargs -n1 kubeval --strict | tee -a apply.txt
+          ./bin/test.sh | tee -a apply.txt
       - name: upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: apply-test-all-yaml
           path: apply.txt
       - name: check apply log for error
         run: |
-          if grep '^ERR' apply.txt; then exit 1; fi
+          if [ -s apply.txt ]; then exit 1; fi

.kubeval-ignore .kubeconform-ignore.kubeval-ignore renamed to .kubeconform-ignore

@@ -5,6 +5,9 @@ yaml-files:
   - '*.yml'
   - '.yamllint'
 
+ignore: |
+  .github/
+
 rules:
   braces: enable
   brackets: enable

.yamllint

@@ -16,9 +16,11 @@ spec:
                 name: testsvc1
                 port:
                   number: 4201
+            pathType: exact
           - path: /path2
             backend:
               service:
                 name: testsvc2
                 port:
                   number: 4202
+            pathType: exact

Ingress/fanout.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
   name: external-lb

Ingress/ingress-class.yaml

@@ -4,8 +4,8 @@ kind: Ingress
 metadata:
   name: test-ingress
 spec:
-  backend:
+  defaultBackend:
     service:
       name: testsvc
       port:
-        number: 80
+        number: 80

Ingress/ingress.yaml

@@ -13,6 +13,7 @@ spec:
                 name: testsvc1
                 port:
                   number: 80
+            pathType: exact
     - host: second.foo.com
       http:
         paths:
@@ -21,6 +22,7 @@ spec:
                 name: testsvc2
                 port:
                   number: 80
+            pathType: exact
     # No host supplied here
     - http:
         paths:
@@ -29,3 +31,4 @@ spec:
                 name: testsvc3
                 port:
                   number: 80
+            pathType: exact

Ingress/nohost.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-rewrite
@@ -12,5 +12,7 @@ spec:
           - path: /rewritepath
             pathType: Prefix
             backend:
-              serviceName: testsvc
-              servicePort: 80
+              service:
+                name: testsvc
+                port:
+                  number: 80

Ingress/rewrite.yaml

@@ -9,7 +9,7 @@ data:
   tls.key: YQo=
 type: kubernetes.io/tls
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: ingress-tls
@@ -24,5 +24,8 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: testsvc1
-              servicePort: 80
+              service:
+                name: testsvc1
+                port:
+                  number: 80
+            pathType: exact

Ingress/tls.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: name-virtual-host-ingress
@@ -9,11 +9,17 @@ spec:
       http:
         paths:
           - backend:
-              serviceName: testsvc1
-              servicePort: 80
+              service:
+                name: testsvc1
+                port:
+                  number: 80
+            pathType: exact
     - host: bar.foo.com
       http:
         paths:
           - backend:
-              serviceName: testsvc2
-              servicePort: 80
+              service:
+                name: testsvc2
+                port:
+                  number: 80
+            pathType: exact