From aac08d45948dc3f6a3fed14c5837be5b79fc1df2 Mon Sep 17 00:00:00 2001 From: shruti2522 Date: Fri, 19 Apr 2024 18:53:54 +0530 Subject: [PATCH 1/3] added makefile rule to to deploy bundle images Signed-off-by: shruti2522 --- Makefile | 7 +++++++ config/manager/kustomization.yaml | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8ad5f0637..7a2d4ffa0 100755 --- a/Makefile +++ b/Makefile @@ -179,6 +179,13 @@ deploy-with-olm: deploy-olm load-on-kind build-and-push-bundle-images ## deploys $(KUSTOMIZE) build config/olm-install | kubectl apply -f - VERSION=$(CSV_VERSION) NAMESPACE=$(NAMESPACE) hack/wait-for-csv.sh +deploy-olm-real: export OPERATOR_SDK=operator-sdk +deploy-olm-real: deploy-olm build-and-push-bundle-images ## deploys the operator via OLM on a real cluster + sed -i 's|image:.*|image: $(BUNDLE_INDEX_IMG)|' config/olm-install/install-resources.yaml + sed -i 's#mymetallb#$(NAMESPACE)#g' config/olm-install/install-resources.yaml + $(KUSTOMIZE) build config/olm-install | kubectl apply -f - + VERSION=$(CSV_VERSION) NAMESPACE=$(NAMESPACE) hack/wait-for-csv.sh + bundle-index-build: opm ## Build the bundle index image. $(OPM) index add --bundles $(BUNDLE_IMG) --tag $(BUNDLE_INDEX_IMG) -c docker -i quay.io/operator-framework/opm:$(OPM_VERSION) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 0b2f94f84..5d0b1ed20 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,10 +1,10 @@ resources: - - manager.yaml +- manager.yaml apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization patchesStrategicMerge: - - env.yaml +- env.yaml images: - - name: controller - newName: quay.io/metallb/metallb-operator - newTag: main +- name: controller + newName: quay.io/metallb/metallb-operator + newTag: dev From 0ba909b620581a469d9777b442cca67d9640a9ac Mon Sep 17 00:00:00 2001 From: shruti2522 Date: Tue, 23 Apr 2024 00:04:29 +0530 Subject: [PATCH 2/3] refactored deploy-with-olm Signed-off-by: shruti2522 --- Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 7a2d4ffa0..b38622e51 100755 --- a/Makefile +++ b/Makefile @@ -167,25 +167,13 @@ kind-cluster: kind load-on-kind: docker-build kind-cluster ## Load the docker image into the kind cluster. $(KIND) load docker-image ${IMG} -deploy-olm: export KIND_WITH_REGISTRY=true -deploy-olm: operator-sdk kind-cluster ## deploys OLM on the cluster - $(OPERATOR_SDK) olm install --version $(OLM_VERSION) --timeout 5m0s - $(OPERATOR_SDK) olm status - deploy-with-olm: export VERSION=dev -deploy-with-olm: deploy-olm load-on-kind build-and-push-bundle-images ## deploys the operator with OLM instead of manifests +deploy-with-olm: load-on-kind build-and-push-bundle-images ## deploys the operator with OLM instead of manifests sed -i 's|image:.*|image: $(BUNDLE_INDEX_IMG)|' config/olm-install/install-resources.yaml sed -i 's#mymetallb#$(NAMESPACE)#g' config/olm-install/install-resources.yaml $(KUSTOMIZE) build config/olm-install | kubectl apply -f - VERSION=$(CSV_VERSION) NAMESPACE=$(NAMESPACE) hack/wait-for-csv.sh -deploy-olm-real: export OPERATOR_SDK=operator-sdk -deploy-olm-real: deploy-olm build-and-push-bundle-images ## deploys the operator via OLM on a real cluster - sed -i 's|image:.*|image: $(BUNDLE_INDEX_IMG)|' config/olm-install/install-resources.yaml - sed -i 's#mymetallb#$(NAMESPACE)#g' config/olm-install/install-resources.yaml - $(KUSTOMIZE) build config/olm-install | kubectl apply -f - - VERSION=$(CSV_VERSION) NAMESPACE=$(NAMESPACE) hack/wait-for-csv.sh - bundle-index-build: opm ## Build the bundle index image. $(OPM) index add --bundles $(BUNDLE_IMG) --tag $(BUNDLE_INDEX_IMG) -c docker -i quay.io/operator-framework/opm:$(OPM_VERSION) From 5d9598d44a7fbff44299bb7844dacf26c98342ac Mon Sep 17 00:00:00 2001 From: shruti2522 Date: Wed, 24 Apr 2024 13:41:52 +0530 Subject: [PATCH 3/3] corrected indentation in kustomization.yaml Signed-off-by: shruti2522 --- config/manager/kustomization.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5d0b1ed20..d27c9ec8b 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,10 +1,10 @@ resources: -- manager.yaml + - manager.yaml apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization patchesStrategicMerge: -- env.yaml + - env.yaml images: -- name: controller - newName: quay.io/metallb/metallb-operator - newTag: dev + - name: controller + newName: quay.io/metallb/metallb-operator + newTag: dev \ No newline at end of file