Replace removed tolerate-unready-endpoints annotation with publishNot…

…ReadyAddresses (#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 kubernetes/kubernetes@ae9f117 Co-authored-by: Eric Shen <[email protected]>
streamnative · Aug 9, 2023 · 9e94e40 · 9e94e40
1 parent 88f836d
commit 9e94e40
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -776,8 +776,7 @@ zookeeper:
   ## templates/zookeeper-service.yaml
   ##
   service:
-    annotations:
-      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+    annotations: {}
   customTools:
     serviceAccount:
       use: true