Skip to content

fix source-objectbucket image replacements in bundle generation #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gauron99 merged 1 commit into from
Jul 31, 2026
+7 −6
Merged

fix source-objectbucket image replacements in bundle generation #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,20 +274,20 @@ deploy: manifests kustomize ## Deploy func-operator controller to the K8s cluste

.PHONY: deploy-source-objectbucket
deploy-source-objectbucket: manifests kustomize ## Deploy objectbucket-notifications-adapter to the K8s cluster.
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image controller=${IMG_SOURCE_OBJECTBUCKET}
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image source-objectbucket-adapter=${IMG_SOURCE_OBJECTBUCKET}
$(KUSTOMIZE) build config/sources/objectbucket/default | $(KUBECTL) apply -f -
$(KUBECTL) wait deployment --all --timeout=120s --for=condition=Available -n objectbucket-notifications-adapter-system

.PHONY: deploy-source-objectbucket-kafka
deploy-source-objectbucket-kafka: manifests kustomize ## Deploy objectbucket-notifications-adapter in Kafka mode.
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image controller=${IMG_SOURCE_OBJECTBUCKET}
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image source-objectbucket-adapter=${IMG_SOURCE_OBJECTBUCKET}
$(KUSTOMIZE) build config/sources/objectbucket/kafka | $(KUBECTL) apply -f -
$(KUBECTL) wait deployment --all --timeout=120s --for=condition=Available -n objectbucket-notifications-adapter-system

.PHONY: deploy-combined
deploy-combined: manifests kustomize ## Deploy both func-operator and all event sources in a single namespace.
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image controller=${IMG_SOURCE_OBJECTBUCKET}
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image source-objectbucket-adapter=${IMG_SOURCE_OBJECTBUCKET}
$(KUSTOMIZE) build config/combined | $(KUBECTL) apply -f -
$(KUBECTL) wait deployment --all --timeout=120s --for=condition=Available -n func-operator-system

Expand Down Expand Up @@ -439,7 +439,8 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
.PHONY: bundle-combined
bundle-combined: manifests kustomize operator-sdk ## Generate combined OLM bundle with both func-operator and all event sources.
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image controller=$(IMG_SOURCE_OBJECTBUCKET)
cd config/sources/objectbucket/manager && $(KUSTOMIZE) edit set image source-objectbucket-adapter=$(IMG_SOURCE_OBJECTBUCKET)
cd config/combined/source-objectbucket && $(KUSTOMIZE) edit set image source-objectbucket-adapter=$(IMG_SOURCE_OBJECTBUCKET)
$(KUSTOMIZE) build config/combined/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
$(OPERATOR_SDK) bundle validate ./bundle

Expand Down
2 changes: 1 addition & 1 deletion config/combined/source-objectbucket/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
args:
- --leader-elect
- --health-probe-bind-address=:8081
image: controller:latest
image: source-objectbucket-adapter:latest
name: manager
env:
- name: NOOBAA_ADAPTER_ID
Expand Down
2 changes: 1 addition & 1 deletion config/sources/objectbucket/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
args:
- --leader-elect
- --health-probe-bind-address=:8081
image: controller:latest
image: source-objectbucket-adapter:latest
name: manager
env:
- name: NOOBAA_ADAPTER_ID
Expand Down
Loading