*: update to ingress apiVersion v1

Author: daurnimator

argocd/ingress.yaml

@@ -1,22 +1,25 @@
 # https://argoproj.github.io/argo-cd/operator-manual/ingress/#ssl-passthrough-with-cert-manager-and-lets-encrypt
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: argocd-server-ingress
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
 spec:
+  ingressClassName: nginx
   rules:
   - host: argocd.hashbang.sh
     http:
       paths:
       - backend:
-          serviceName: argocd-server
-          servicePort: https
+          service:
+            name: argocd-server
+            port:
+              name: https
         path: /
+        pathType: Prefix
   tls:
   - hosts:
     - argocd.hashbang.sh

book/resources.yaml

@@ -43,15 +43,15 @@ spec:
   selector:
     app: book
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: book-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     external-dns.alpha.kubernetes.io/hostname: book.hashbang.sh
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - book.hashbang.sh
@@ -60,7 +60,10 @@ spec:
   - host: book.hashbang.sh
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: book
-          servicePort: 80
+      - backend:
+          service:
+            name: book
+            port:
+              number: 80
+        path: /
+        pathType: Prefix

monitoring/ingress.yaml

@@ -1,70 +1,79 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: grafana
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-secret: user-auth
     nginx.ingress.kubernetes.io/auth-secret-type: auth-map
 spec:
+  ingressClassName: nginx
   rules:
   - host: grafana.hashbang.sh
     http:
       paths:
       - backend:
-          serviceName: grafana
-          servicePort: 80
+          service:
+            name: grafana
+            port:
+              number: 80
         path: /
+        pathType: Prefix
   tls:
   - hosts:
     - grafana.hashbang.sh
     secretName: grafana-tls
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: alertmanager
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-secret: user-auth
     nginx.ingress.kubernetes.io/auth-secret-type: auth-map
 spec:
+  ingressClassName: nginx
   rules:
   - host: alertmanager.hashbang.sh
     http:
       paths:
       - backend:
-          serviceName: alertmanager-main
-          servicePort: 9093
+          service:
+            name: alertmanager-main
+            port:
+              number: 9093
         path: /
+        pathType: Prefix
   tls:
   - hosts:
     - alertmanager.hashbang.sh
     secretName: alertmanager-tls
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: prometheus
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/auth-type: basic
     nginx.ingress.kubernetes.io/auth-secret: user-auth
     nginx.ingress.kubernetes.io/auth-secret-type: auth-map
 spec:
+  ingressClassName: nginx
   rules:
   - host: prometheus.hashbang.sh
     http:
       paths:
       - backend:
-          serviceName: prometheus-k8s
-          servicePort: 9090
+          service:
+            name: prometheus-k8s
+            port:
+              number: 9090
         path: /
+        pathType: Prefix
   tls:
   - hosts:
     - prometheus.hashbang.sh

site/resources.yaml

@@ -54,25 +54,28 @@ spec:
   selector:
     app: site
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: site-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     external-dns.alpha.kubernetes.io/hostname: hashbang.sh
     nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
-  tls:
-  - hosts:
-    - hashbang.sh
-    secretName: site-tls
+  ingressClassName: nginx
   rules:
   - host: hashbang.sh
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: site
-          servicePort: 80
+      - backend:
+          service:
+            name: site
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - hashbang.sh
+    secretName: site-tls

webirc/resources.yaml

@@ -50,24 +50,27 @@ spec:
   selector:
     app: webirc
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: webirc-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     external-dns.alpha.kubernetes.io/hostname: webirc.hashbang.sh
 spec:
-  tls:
-  - hosts:
-    - webirc.hashbang.sh
-    secretName: webirc-tls
+  ingressClassName: nginx
   rules:
   - host: webirc.hashbang.sh
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: webirc
-          servicePort: 80
+      - backend:
+          service:
+            name: webirc
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - webirc.hashbang.sh
+    secretName: webirc-tls