From ab66e2432049b42ef490a53d2a4dc12d699aa3c9 Mon Sep 17 00:00:00 2001 From: Marcel Lautenbach Date: Thu, 22 Jun 2023 23:31:24 +0200 Subject: [PATCH] docs: replace deprecated ingress.class annotation Documentation and examples used a deprecated annotation to set the Ingress class name. This commit replaces it with the correct version using spec.ingressClassName . Signed-off-by: Marcel Lautenbach (cherry picked from commit 9d335ad8140d65c51be91019d53260e96526f11f) --- .../Storage-Configuration/Monitoring/ceph-dashboard.md | 2 +- deploy/charts/rook-ceph-cluster/values.yaml | 1 - deploy/examples/dashboard-ingress-https.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/Storage-Configuration/Monitoring/ceph-dashboard.md b/Documentation/Storage-Configuration/Monitoring/ceph-dashboard.md index 7f11867c4..4f336e4c4 100755 --- a/Documentation/Storage-Configuration/Monitoring/ceph-dashboard.md +++ b/Documentation/Storage-Configuration/Monitoring/ceph-dashboard.md @@ -205,12 +205,12 @@ metadata: name: rook-ceph-mgr-dashboard namespace: rook-ceph annotations: - kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" nginx.ingress.kubernetes.io/server-snippet: | proxy_ssl_verify off; spec: + ingressClassName: "nginx" tls: - hosts: - rook-ceph.example.com diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 3ccec8979..c8bd02a69 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -416,7 +416,6 @@ ingress: # annotations: # external-dns.alpha.kubernetes.io/hostname: dashboard.example.com # nginx.ingress.kubernetes.io/rewrite-target: /ceph-dashboard/$2 - # kubernetes.io/ingress.class: nginx # If the dashboard has ssl: true the following will make sure the NGINX Ingress controller can expose the dashboard correctly # nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" # nginx.ingress.kubernetes.io/server-snippet: | diff --git a/deploy/examples/dashboard-ingress-https.yaml b/deploy/examples/dashboard-ingress-https.yaml index 114e7288b..72da62873 100644 --- a/deploy/examples/dashboard-ingress-https.yaml +++ b/deploy/examples/dashboard-ingress-https.yaml @@ -11,12 +11,12 @@ metadata: name: rook-ceph-mgr-dashboard namespace: rook-ceph # namespace:cluster annotations: - kubernetes.io/ingress.class: "nginx" kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" nginx.ingress.kubernetes.io/server-snippet: | proxy_ssl_verify off; spec: + ingressClassName: "nginx" tls: - hosts: - rook-ceph.example.com