From 860ea070b983c878254faad44ae35b903f28548b Mon Sep 17 00:00:00 2001
From: Mohamed Mahmoud <mmahmoud@redhat.com>
Date: Thu, 23 May 2024 17:00:05 -0400
Subject: [PATCH] Misc fixed to get kind cluster running in the new repo

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
---
 Makefile                                    | 12 ++++++++++--
 config/bpfman-deployment/config.yaml        |  1 -
 config/bpfman-deployment/kustomization.yaml |  3 ---
 config/crd/kustomization.yaml               |  3 +--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4ee221cf8..07bb0c9f1 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +48,16 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 endif
 IMAGE_TAG ?= latest
 # Image URL to use all building/pushing image targets
+<<<<<<< HEAD
 BPFMAN_IMG ?= quay.io/bpfman/bpfman:$(IMAGE_TAG)
 BPFMAN_AGENT_IMG ?= quay.io/bpfman/bpfman-agent:$(IMAGE_TAG)
 BPFMAN_OPERATOR_IMG ?= quay.io/bpfman/bpfman-operator:$(IMAGE_TAG)
 BPFMAN_OPERATOR_BUNDLE_IMG ?= quay.io/bpfman/bpfman-operator-bundle:$(IMAGE_TAG)
+=======
+BPFMAN_AGENT_IMG ?= quay.io/bpfman/bpfman-agent:latest
+BPFMAN_OPERATOR_IMG ?= quay.io/bpfman/bpfman-operator:latest
+BPFMAN_OPERATOR_BUNDLE_IMG ?= quay.io/bpfman/bpfman-operator-bundle:latest
+>>>>>>> b05ce5b (Misc fixed to get kind cluster running in the new repo)
 KIND_CLUSTER_NAME ?= bpfman-deployment
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -300,8 +306,12 @@ test-integration: ## Run Integration tests.
 .PHONY: bundle
 bundle: operator-sdk generate kustomize manifests ## Generate bundle manifests and metadata, then validate generated files.
 	cd config/bpfman-operator-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-operator=${BPFMAN_OPERATOR_IMG}
+<<<<<<< HEAD
 	cd config/bpfman-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman=${BPFMAN_IMG} &&\
 	 $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-agent=${BPFMAN_AGENT_IMG}
+=======
+	cd config/bpfman-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-agent=${BPFMAN_AGENT_IMG}
+>>>>>>> b05ce5b (Misc fixed to get kind cluster running in the new repo)
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	cp config/manifests/dependencies.yaml bundle/metadata/
 	$(OPERATOR_SDK) bundle validate ./bundle
@@ -455,7 +465,6 @@ destroy-kind: ## Destroy Kind cluster
 ## Default deploy target is KIND based with its CSI driver initialized.
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy bpfman-operator to the K8s cluster specified in ~/.kube/config with the csi driver initialized.
-	cd config/bpfman-operator-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-operator=${BPFMAN_OPERATOR_IMG}
 	cd config/bpfman-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman=${BPFMAN_IMG} && \
 	$(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-agent=${BPFMAN_AGENT_IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
@@ -478,7 +487,6 @@ run-on-kind: kustomize setup-kind build-images load-images-kind deploy ## Kind D
 
 .PHONY: deploy-openshift
 deploy-openshift: manifests kustomize ## Deploy bpfman-operator to the Openshift cluster specified in ~/.kube/config.
-	cd config/bpfman-operator-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-operator=${BPFMAN_OPERATOR_IMG}
 	cd config/bpfman-deployment && $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman=${BPFMAN_IMG} \
 	&& $(KUSTOMIZE) edit set image quay.io/bpfman/bpfman-agent=${BPFMAN_AGENT_IMG}
 	$(KUSTOMIZE) build config/openshift | kubectl apply -f -
diff --git a/config/bpfman-deployment/config.yaml b/config/bpfman-deployment/config.yaml
index ac9177f76..553c4ffa7 100644
--- a/config/bpfman-deployment/config.yaml
+++ b/config/bpfman-deployment/config.yaml
@@ -6,7 +6,6 @@ metadata:
 data:
   ## Can be configured at runtime
   bpfman.agent.image: quay.io/bpfman/bpfman-agent:latest
-  bpfman.image: quay.io/bpfman/bpfman:latest
   ## Can be set to "info", "debug", or "trace"
   bpfman.agent.log.level: info
   ## See https://docs.rs/env_logger/latest/env_logger/ for configuration options
diff --git a/config/bpfman-deployment/kustomization.yaml b/config/bpfman-deployment/kustomization.yaml
index 588074f99..bf34c2269 100644
--- a/config/bpfman-deployment/kustomization.yaml
+++ b/config/bpfman-deployment/kustomization.yaml
@@ -3,9 +3,6 @@ resources:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- name: quay.io/bpfman/bpfman
-  newName: quay.io/bpfman/bpfman
-  newTag: latest
 - name: quay.io/bpfman/bpfman-agent
   newName: quay.io/bpfman/bpfman-agent
   newTag: latest
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 3f909bb4a..ae82d432b 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -10,8 +10,7 @@ resources:
   - bases/bpfman.io_uprobeprograms.yaml
   - bases/bpfman.io_fentryprograms.yaml
   - bases/bpfman.io_fexitprograms.yaml
-
-- bases/bpfman.io_bpfapplications.yaml
+  - bases/bpfman.io_bpfapplications.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge: