From fb4c44f44924eadc97f4dcb14cf2c2d65ced77a0 Mon Sep 17 00:00:00 2001
From: Naveen Ramanathan <45779883+naveen1100@users.noreply.github.com>
Date: Thu, 15 Oct 2020 16:12:13 +0530
Subject: [PATCH] changed publishNotReadyAddresses to (#64)

### Motivation

* ```publishNotReadyAddresses``` is a service spec and not a service annotation. This is mentioned in the K8s API docs at https://v1-17.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.15/#servicespec-v1-core

### Modifications

* Modified ```publishNotReadyAddresses``` from annotation to service spec

### Verifying this change

- [x] Make sure that the change passes the CI checks.
---
 charts/pulsar/templates/bookkeeper-service.yaml | 5 +++++
 charts/pulsar/values.yaml                       | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/pulsar/templates/bookkeeper-service.yaml b/charts/pulsar/templates/bookkeeper-service.yaml
index 388635b..cd2578e 100644
--- a/charts/pulsar/templates/bookkeeper-service.yaml
+++ b/charts/pulsar/templates/bookkeeper-service.yaml
@@ -26,8 +26,10 @@ metadata:
   labels:
     {{- include "pulsar.standardLabels" . | nindent 4 }}
     component: {{ .Values.bookkeeper.component }}
+{{- if .Values.bookkeeper.service.annotations }}
   annotations:
 {{ toYaml .Values.bookkeeper.service.annotations | indent 4 }}
+{{- end }}
 spec:
   ports:
   - name: bookie
@@ -38,4 +40,7 @@ spec:
   selector:
     {{- include "pulsar.matchLabels" . | nindent 4 }}
     component: {{ .Values.bookkeeper.component }}
+  {{- if .Values.bookkeeper.service.spec }}
+    {{- toYaml .Values.bookkeeper.service.spec | trim | nindent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index eb48d99..8ad5d95 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -489,8 +489,8 @@ bookkeeper:
   ## templates/bookkeeper-service.yaml
   ##
   service:
-    annotations:
-      publishNotReadyAddresses: "true"
+    spec:
+      publishNotReadyAddresses: true
   ## Bookkeeper PodDisruptionBudget
   ## templates/bookkeeper-pdb.yaml
   ##