Issue 124: The additionalPrinterColumn of the Zookeeper Cluster "repl…

…icas" prints incorrect value (#131) * Issue 124: Modifying the Zookeeper Operator CRD Signed-off-by: SrishT <[email protected]> * Issue 124: Addressing review comments Signed-off-by: SrishT <[email protected]>
pravega · Feb 28, 2020 · 21e2d3b · 21e2d3b
1 parent d84aefd
commit 21e2d3b
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/charts/zookeeper-operator/Chart.yaml b/charts/zookeeper-operator/Chart.yaml
@@ -1,6 +1,6 @@
 name: zookeeper-operator
-version: 0.2.2
-appVersion: 0.2.2
+version: latest
+appVersion: latest
 description: zookeeper operator Helm chart for Kubernetes
 keywords:
 - zookeeper

diff --git a/charts/zookeeper-operator/templates/crd.yaml b/charts/zookeeper-operator/templates/crd.yaml
@@ -13,6 +13,22 @@ spec:
     shortNames:
     - zk
   additionalPrinterColumns:
+  - name: Replicas
+    type: integer
+    description: The number of ZooKeeper servers in the ensemble
+    JSONPath: .spec.replicas
+  - name: Ready Replicas
+    type: integer
+    description: The number of ZooKeeper servers in the ensemble that are in a Ready state
+    JSONPath: .status.readyReplicas
+  - name: Internal Endpoint
+    type: string
+    description: Client endpoint internal to cluster network
+    JSONPath: .status.internalClientEndpoint
+  - name: External Endpoint
+    type: string
+    description: Client endpoint external to cluster network via LoadBalancer
+    JSONPath: .status.externalClientEndpoint
   - name: Age
     type: date
     JSONPath: .metadata.creationTimestamp

diff --git a/charts/zookeeper-operator/values.yaml b/charts/zookeeper-operator/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: pravega/zookeeper-operator
-  tag: 0.2.2
+  tag: latest
   pullPolicy: IfNotPresent
 
 ## Install RBAC roles and bindings

diff --git a/charts/zookeeper/Chart.yaml b/charts/zookeeper/Chart.yaml
@@ -1,6 +1,6 @@
 name: zookeeper
-version: 0.2.2
-appVersion: 0.2.2
+version: latest
+appVersion: latest
 description: zookeeper Helm chart for Kubernetes
 keywords:
 - zookeeper

diff --git a/charts/zookeeper/templates/zookeeper.yaml b/charts/zookeeper/templates/zookeeper.yaml
@@ -4,3 +4,6 @@ metadata:
   name: {{ template "zookeeper.fullname" . }}
 spec:
   replicas: 3
+  image:
+    repository: {{ with .Values.image }}{{ .repository }}{{ end }}
+    tag: {{ with .Values.image }}{{ .tag }}{{ end }}
diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml
@@ -1,4 +1,4 @@
 image:
   repository: pravega/zookeeper
-  tag: 0.2.2
+  tag: latest
   pullPolicy: IfNotPresent
diff --git a/deploy/crds/zookeeper_v1beta1_zookeepercluster_crd.yaml b/deploy/crds/zookeeper_v1beta1_zookeepercluster_crd.yaml
@@ -15,7 +15,7 @@ spec:
   - name: Replicas
     type: integer
     description: The number of ZooKeeper servers in the ensemble
-    JSONPath: .status.replicas
+    JSONPath: .spec.replicas
   - name: Ready Replicas
     type: integer
     description: The number of ZooKeeper servers in the ensemble that are in a Ready state