From 9e94e40f0796895a49f795e6ef0e08a29852b7ea Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Wed, 9 Aug 2023 11:04:07 +0300
Subject: [PATCH] Replace removed tolerate-unready-endpoints annotation with
 publishNotReadyAddresses (#1066)

Use publishNotReadyAddresses instead of tolerate-unready-endpoints annotation that got removed in k8s 1.24

- service.alpha.kubernetes.io/tolerate-unready-endpoints was removed in k8s 1.24
  with commit https://github.com/kubernetes/kubernetes/commit/ae9f1173870822c186a1ddd696835cc5a9b989ec

Co-authored-by: Eric Shen <ericshenyuhao@outlook.com>
---
 .../templates/zookeeper/zookeeper-backup-service.yaml       | 1 +
 charts/pulsar/templates/zookeeper/zookeeper-service.yaml    | 1 +
 charts/pulsar/values.yaml                                   | 6 ++----
 .../templates/zookeeper/zookeeper-backup-service.yaml       | 1 +
 charts/sn-platform-slim/values.yaml                         | 3 +--
 .../templates/zookeeper/zookeeper-backup-service.yaml       | 1 +
 charts/sn-platform/values.yaml                              | 3 +--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/pulsar/templates/zookeeper/zookeeper-backup-service.yaml b/charts/pulsar/templates/zookeeper/zookeeper-backup-service.yaml
index ad6c8960..380a1b0d 100644
--- a/charts/pulsar/templates/zookeeper/zookeeper-backup-service.yaml
+++ b/charts/pulsar/templates/zookeeper/zookeeper-backup-service.yaml
@@ -38,6 +38,7 @@ spec:
       port: {{ .Values.zookeeper.ports.clientTls }}
     {{- end }}
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.zookeeper.customTools.backup.component }}
diff --git a/charts/pulsar/templates/zookeeper/zookeeper-service.yaml b/charts/pulsar/templates/zookeeper/zookeeper-service.yaml
index 7ee9890a..15452c26 100644
--- a/charts/pulsar/templates/zookeeper/zookeeper-service.yaml
+++ b/charts/pulsar/templates/zookeeper/zookeeper-service.yaml
@@ -42,6 +42,7 @@ spec:
       port: {{ .Values.zookeeper.ports.clientTls }}
     {{- end }}
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.zookeeper.component }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index 9b426047..09e1053d 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -644,8 +644,7 @@ zookeeper:
   ## templates/zookeeper-service.yaml
   ##
   service:
-    annotations:
-      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+    annotations: {}
   ## Zookeeper PodDisruptionBudget
   ## templates/zookeeper-pdb.yaml
   ##
@@ -857,8 +856,7 @@ bookkeeper:
   ## templates/bookkeeper-service.yaml
   ##
   service:
-    annotations:
-      publishNotReadyAddresses: "true"
+    annotations: {}
   ## Bookkeeper PodDisruptionBudget
   ## templates/bookkeeper-pdb.yaml
   ##
diff --git a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-service.yaml b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-service.yaml
index ad6c8960..380a1b0d 100644
--- a/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-service.yaml
+++ b/charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-service.yaml
@@ -38,6 +38,7 @@ spec:
       port: {{ .Values.zookeeper.ports.clientTls }}
     {{- end }}
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.zookeeper.customTools.backup.component }}
diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
index 95a7f7fb..e569850a 100644
--- a/charts/sn-platform-slim/values.yaml
+++ b/charts/sn-platform-slim/values.yaml
@@ -701,8 +701,7 @@ zookeeper:
   ## templates/zookeeper-service.yaml
   ##
   service:
-    annotations:
-      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+    annotations: {}
   customTools:
     serviceAccount:
       use: true
diff --git a/charts/sn-platform/templates/zookeeper/zookeeper-backup-service.yaml b/charts/sn-platform/templates/zookeeper/zookeeper-backup-service.yaml
index ad6c8960..380a1b0d 100644
--- a/charts/sn-platform/templates/zookeeper/zookeeper-backup-service.yaml
+++ b/charts/sn-platform/templates/zookeeper/zookeeper-backup-service.yaml
@@ -38,6 +38,7 @@ spec:
       port: {{ .Values.zookeeper.ports.clientTls }}
     {{- end }}
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.zookeeper.customTools.backup.component }}
diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
index 7ff72f09..9c95505c 100644
--- a/charts/sn-platform/values.yaml
+++ b/charts/sn-platform/values.yaml
@@ -776,8 +776,7 @@ zookeeper:
   ## templates/zookeeper-service.yaml
   ##
   service:
-    annotations:
-      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+    annotations: {}
   customTools:
     serviceAccount:
       use: true