Use Ingress className instead of kubernetes.io/ingress.class annotati…

…on which has been deprecated since Kubernetes 1.18+ (#69)
apache · Jan 9, 2023 · eb38c30 · eb38c30
1 parent 60cb33e
commit eb38c30
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/couchdb/NEWS.md b/couchdb/NEWS.md
@@ -23,6 +23,12 @@
 - Add PersistentVolume annotations
 
 ## 3.6.2
+<<<<<<< HEAD
 >>>>>>> b8342f7 (add service.labels and fix ingress service reference)
 
 - Use Ingress `className` instead of `kubernetes.io/ingress.class` annotation which has been deprecated since Kubernetes 1.18+ ([#69](https://github.com/apache/couchdb-helm/issues/69))
+=======
+
+- Change the `erlangCookie` to be auto-generated in a stateful fashion (i.e. we auto-generate it once, then leave that
+ value alone). ([#78](https://github.com/apache/couchdb-helm/issues/78))
+>>>>>>> e70e227 (Update NEWS.md)