Skip to content
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

Jump to bottom

Use dev image instead of published image #146

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Use dev image instead of published image #146

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
2 changes: 1 addition & 1 deletion admission-webhook/make/dev_cluster.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ deploy_dev_webhook:
# deploys the webhook to the kind cluster with the release image
.PHONY: deploy_webhook
deploy_webhook:
K8S_GMSA_IMAGE=$(WEBHOOK_IMG) $(MAKE) _deploy_webhook
K8S_GMSA_IMAGE=$(WEBHOOK_IMG):$(TAG) $(MAKE) _deploy_webhook

# removes the webhook from the kind cluster
.PHONY: remove_webhook
Expand Down
8 changes: 4 additions & 4 deletions admission-webhook/make/helm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ helm-lint:
# deploys the chart to the kind cluster with the release image
.PHONY: deploy_chart
deploy_chart: install-helm
K8S_GMSA_IMAGE=$(IMAGE_NAME) $(MAKE) _deploy_chart
K8S_GMSA_IMAGE=$(WEBHOOK_IMG) $(MAKE) _deploy_chart

# removes the chart from the kind cluster
.PHONY: remove_chart
Expand All @@ -37,15 +37,15 @@ remove_chart:
# $K8S_GMSA_DEPLOY_CHART_VERSION env variables to build the download URL. If VERSION is
# not set then latest is used.
.PHONY: _deploy_chart
_deploy_chart: _start_cluster_if_not_running _deploy_certmanager
_deploy_chart: _copy_image _deploy_certmanager
ifeq ($(K8S_GMSA_CHART),)
@ echo "Cannot call target $@ without setting K8S_GMSA_CHART"
exit 1
endif
@ echo "installing helm deployment $(DEPLOYMENT_NAME) with chart $(K8S_GMSA_CHART) and image $(IMAGE_REPO):$(VERSION)"
@ echo "installing helm deployment $(DEPLOYMENT_NAME) with chart $(K8S_GMSA_CHART) and image $(K8S_GMSA_IMAGE):$(TAG)"
KUBECONFIG=$(KUBECONFIG) $(KUBECTL) create namespace $(NAMESPACE)
KUBECONFIG=$(KUBECONFIG) $(HELM) version
KUBECONFIG=$(KUBECONFIG) $(HELM) install $(DEPLOYMENT_NAME) $(K8S_GMSA_CHART) --namespace $(NAMESPACE)
KUBECONFIG=$(KUBECONFIG) $(HELM) install $(DEPLOYMENT_NAME) $(K8S_GMSA_CHART) --set image.repository=$(K8S_GMSA_IMAGE) --set image.tag=$(TAG) --namespace $(NAMESPACE) $(HELM_INSTALL_FLAGS_FLAGS)
KUBECONFIG=$(KUBECONFIG) $(KUBECTL) wait -n $(NAMESPACE) pod -l app=$(DEPLOYMENT_NAME) --for=condition=Ready

.PHONY: _deploy_certmanager
Expand Down
Loading