From 80a60cb90a2070b1b69439dd9aa155b5312176c7 Mon Sep 17 00:00:00 2001
From: Kaiwalya Joshi <kjoshi@d2iq.com>
Date: Tue, 9 Jan 2024 19:40:52 -0600
Subject: [PATCH 1/2] fix: Update zookeeper-operator defaults for zookeeper
 image.

---
 api/v1beta1/zookeepercluster_types.go                         | 4 ++--
 api/v1beta1/zookeepercluster_types_test.go                    | 2 +-
 charts/zookeeper/values.yaml                                  | 4 ++--
 config/manager/manager.yaml                                   | 2 +-
 config/samples/ECS/zookeeper_v1beta1_zookeepercluster_cr.yaml | 4 ++--
 .../pravega/zookeeper_v1beta1_zookeepercluster_cr.yaml        | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api/v1beta1/zookeepercluster_types.go b/api/v1beta1/zookeepercluster_types.go
index f64474b4..944e16b6 100644
--- a/api/v1beta1/zookeepercluster_types.go
+++ b/api/v1beta1/zookeepercluster_types.go
@@ -22,11 +22,11 @@ import (
 const (
 	// DefaultZkContainerRepository is the default docker repo for the zookeeper
 	// container
-	DefaultZkContainerRepository = "pravega/zookeeper"
+	DefaultZkContainerRepository = "ghcr.io/mesosphere/zookeeper"
 
 	// DefaultZkContainerVersion is the default tag used for for the zookeeper
 	// container
-	DefaultZkContainerVersion = "0.2.15"
+	DefaultZkContainerVersion = "0.2.15-d2iq"
 
 	// DefaultZkContainerPolicy is the default container pull policy used
 	DefaultZkContainerPolicy = "Always"
diff --git a/api/v1beta1/zookeepercluster_types_test.go b/api/v1beta1/zookeepercluster_types_test.go
index c8d59fb0..3387ac47 100644
--- a/api/v1beta1/zookeepercluster_types_test.go
+++ b/api/v1beta1/zookeepercluster_types_test.go
@@ -79,7 +79,7 @@ var _ = Describe("ZookeeperCluster Types", func() {
 			})
 
 			It("Checking tostring() function", func() {
-				Ω(z.Spec.Image.ToString()).To(Equal("pravega/zookeeper:0.2.15"))
+				Ω(z.Spec.Image.ToString()).To(Equal("ghcr.io/mesosphere/zookeeper:0.2.15-d2iq"))
 			})
 
 		})
diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml
index 8a449f0b..437485f6 100644
--- a/charts/zookeeper/values.yaml
+++ b/charts/zookeeper/values.yaml
@@ -2,8 +2,8 @@ replicas: 3
 maxUnavailableReplicas:
 
 image:
-  repository: pravega/zookeeper
-  tag: 0.2.15
+  repository: ghcr.io/mesosphere/zookeeper
+  tag: 0.2.15-d2iq
   pullPolicy: IfNotPresent
 
 triggerRollingRestart: false
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 18163b4c..f71fe495 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         - name: zookeeper-operator
           # Replace this with the built image name
-          image: pravega/zookeeper-operator:0.2.15
+          image: ghcr.io/meosphere/zookeeper-operator:0.2.15-d2iq
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/config/samples/ECS/zookeeper_v1beta1_zookeepercluster_cr.yaml b/config/samples/ECS/zookeeper_v1beta1_zookeepercluster_cr.yaml
index 8130f753..679f9a1f 100644
--- a/config/samples/ECS/zookeeper_v1beta1_zookeepercluster_cr.yaml
+++ b/config/samples/ECS/zookeeper_v1beta1_zookeepercluster_cr.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    repository: pravega/zookeeper
-    tag: 0.2.15
+    repository: ghcr.io/mesosphere/zookeeper
+    tag: 0.2.15-d2iq
   storageType: persistence
   persistence:
     reclaimPolicy: Retain
diff --git a/config/samples/pravega/zookeeper_v1beta1_zookeepercluster_cr.yaml b/config/samples/pravega/zookeeper_v1beta1_zookeepercluster_cr.yaml
index d3520411..cbf2eba7 100644
--- a/config/samples/pravega/zookeeper_v1beta1_zookeepercluster_cr.yaml
+++ b/config/samples/pravega/zookeeper_v1beta1_zookeepercluster_cr.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    repository: pravega/zookeeper
-    tag: 0.2.15
+    repository: ghcr.io/mesosphere/zookeeper
+    tag: 0.2.15-d2iq
   storageType: persistence
   persistence:
     reclaimPolicy: Delete

From 0a06a2a93bd841b8e1eb45aa4dd4de5304de642b Mon Sep 17 00:00:00 2001
From: Kaiwalya Joshi <kjoshi@d2iq.com>
Date: Tue, 9 Jan 2024 20:00:09 -0600
Subject: [PATCH 2/2] fix: Update patched image and fix typo.

---
 Makefile                    | 2 +-
 config/manager/manager.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0ede5ca3..9349214a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ crds: ## Generate CRDs
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests kustomize
-	cd config/manager && $(KUSTOMIZE) edit set image pravega/zookeeper-operator=$(TEST_IMAGE)
+	cd config/manager && $(KUSTOMIZE) edit set image ghcr.io/mesosphere/zookeeper-operator=$(TEST_IMAGE)
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index f71fe495..23e5fe4e 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         - name: zookeeper-operator
           # Replace this with the built image name
-          image: ghcr.io/meosphere/zookeeper-operator:0.2.15-d2iq
+          image: ghcr.io/mesosphere/zookeeper-operator:0.2.15-d2iq
           ports:
           - containerPort: 60000
             name: metrics