Skip to content

Commit a70e465

Browse files
committed
make: configure operator for bink deployment
Allow insecure registries and reduce the polling time for the registry resolution tag for the controller. This allows the controller to talk to the bink registry and reduce the polling time to speed up the tests. Signed-off-by: Alice Frosi <afrosi@redhat.com>
1 parent b114a12 commit a70e465

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ deploy: manifests kustomize yq ## Deploy controller to the K8s cluster specified
113113
"$(KUSTOMIZE)" build config/default | \
114114
"$(YQ)" '(select(.kind == "Deployment") | .spec.template.spec.containers[] | select(.name == "manager")).image = "$(IMG)"' | \
115115
"$(YQ)" '(select(.kind == "DaemonSet") | .spec.template.spec.containers[] | select(.name == "daemon")).image = "$(IMG)"' | \
116+
$(if $(MANAGER_EXTRA_ARGS),"$(YQ)" '(select(.kind == "Deployment") | .spec.template.spec.containers[] | select(.name == "manager")).args += [$(MANAGER_EXTRA_ARGS)]' |) \
116117
"$(KUBECTL)" apply --server-side -f -
117118

118119
.PHONY: undeploy
@@ -147,7 +148,8 @@ deploy-bink: start-bink build-update-image kustomize ## Deploy to a bink cluster
147148
# On re-deploy, restart the rollout to force a re-pull of the :latest tag.
148149
# On fresh deploy, skip the restart -- the pod is already pulling the correct image.
149150
@existed=$$(kubectl --kubeconfig $(KUBECONFIG_BINK) -n bootc-operator get deploy bootc-operator-controller-manager -o name 2>/dev/null || true) && \
150-
$(MAKE) deploy KUBECONFIG=$(abspath $(KUBECONFIG_BINK)) IMG=$(IMG_BINK) && \
151+
$(MAKE) deploy KUBECONFIG=$(abspath $(KUBECONFIG_BINK)) IMG=$(IMG_BINK) \
152+
MANAGER_EXTRA_ARGS='"--allow-insecure-registry","--tag-resolution-interval=10s"' && \
151153
if [ -n "$$existed" ]; then \
152154
kubectl --kubeconfig $(KUBECONFIG_BINK) -n bootc-operator rollout restart deployment/bootc-operator-controller-manager; \
153155
fi

0 commit comments

Comments
 (0)