Skip to content

Commit

Permalink
[make]Add force-bump target to bump operator deps
Browse files Browse the repository at this point in the history
The new force-bump target bumps operator and lib-common dependencies of
this operator by tracking the same branch from these dependencies.

18.0-fr1 only change:

* resolve the merge conflict in Makefile due to 80771af is not in 18.0-fr1
* switched the branch target of force-bump to 18.0-fr1

Related: OSPRH-8355
(cherry picked from commit 38113a0)
  • Loading branch information
gibizer committed Nov 25, 2024
1 parent 78d219a commit 807ee40
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,13 @@ run-with-webhook: export HEALTH_PORT?=8081
run-with-webhook: manifests generate fmt vet ## Run a controller from your host.
/bin/bash hack/configure_local_webhook.sh
OPERATOR_TEMPLATES=./templates go run ./main.go -metrics-bind-address ":$(METRICS_PORT)" -health-probe-bind-address ":$(HEALTH_PORT)"

BRANCH=18.0-fr1
.PHONY: force-bump
force-bump: ## Force bump operator and lib-common dependencies
for dep in $$(cat go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|openstack-baremetal-operator|^replace' | awk '{print $$1}'); do \
go get $$dep@$(BRANCH) ; \
done
for dep in $$(cat api/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|openstack-baremetal-operator|^replace' | awk '{print $$1}'); do \
cd ./api && go get $$dep@$(BRANCH) && cd .. ; \
done

0 comments on commit 807ee40

Please sign in to comment.