Skip to content

Commit

Permalink
Fix deploy-stable target
Browse files Browse the repository at this point in the history
Don't pass version into deploy-with-helm so imageTag is set to the
version from released chart.

Signed-off-by: Dinar Valeev <dinar.valeev@absa.africa>
  • Loading branch information
k0da committed May 10, 2021
1 parent 2473ab7 commit 5e0e122
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ deploy-full-local-setup: ## Deploy full local multicluster setup (k3d >= 4.2.0)

.PHONY: deploy-stable
deploy-stable:
@echo "\n$(YELLOW) import $(CYAN)k8gb:$(VERSION) $(YELLOW)to $(CYAN)$(CLUSTER_GSLB1), $(CLUSTER_GSLB2) $(NC)"
$(call deploy-local-cluster,$(CLUSTER_GSLB1),$(CLUSTER_GSLB2),$(VERSION),,'k8gb/k8gb')
$(call deploy-local-cluster,$(CLUSTER_GSLB2),$(CLUSTER_GSLB1),$(VERSION),$(CLUSTER_GSLB2_HELM_ARGS),'k8gb/k8gb')
STABLE_VERSION="stable"
@echo "\n$(YELLOW) import $(CYAN)k8gb:$(STABLE_VERSION) $(YELLOW)to $(CYAN)$(CLUSTER_GSLB1), $(CLUSTER_GSLB2) $(NC)"
$(call deploy-local-cluster,$(CLUSTER_GSLB1),$(CLUSTER_GSLB2),$(STABLE_VERSION),,'k8gb/k8gb')
$(call deploy-local-cluster,$(CLUSTER_GSLB2),$(CLUSTER_GSLB1),$(STABLE_VERSION),$(CLUSTER_GSLB2_HELM_ARGS),'k8gb/k8gb')

$(call list-running-pods,$(CLUSTER_GSLB1))
$(call list-running-pods,$(CLUSTER_GSLB2))
Expand All @@ -126,11 +127,11 @@ upgrade-candidate: ## Upgrade k8gb to the test version on existing clusters
k3d image import $(REPO):$(SEMVER) -c $(CLUSTER_GSLB1)
k3d image import $(REPO):$(SEMVER) -c $(CLUSTER_GSLB2)

@echo "\n$(YELLOW)Upgrade GSLB operator from $(VERSION) to $(SEMVER) on k3d-$(CLUSTER_GSLB1) $(NC)"
@echo "\n$(YELLOW)Upgrade GSLB operator from $(STABLE_VERSION) to $(SEMVER) on k3d-$(CLUSTER_GSLB1) $(NC)"
kubectl config use-context k3d-$(CLUSTER_GSLB1)
$(call deploy-k8gb-with-helm,$(CLUSTER_GSLB1),$(CLUSTER_GSLB2),$(SEMVER),,'./chart/k8gb')

@echo "\n$(YELLOW)Upgrade GSLB operator from $(VERSION) to $(SEMVER) on k3d-$(CLUSTER_GSLB2) $(NC)"
@echo "\n$(YELLOW)Upgrade GSLB operator from $(STABLE_VERSION) to $(SEMVER) on k3d-$(CLUSTER_GSLB2) $(NC)"
kubectl config use-context k3d-$(CLUSTER_GSLB2)
$(call deploy-k8gb-with-helm,$(CLUSTER_GSLB2),$(CLUSTER_GSLB1),$(SEMVER),$(CLUSTER_GSLB2_HELM_ARGS),'./chart/k8gb')

Expand Down Expand Up @@ -350,7 +351,8 @@ define deploy-local-cluster
@echo "\n$(YELLOW)Create namespace $(NC)"
kubectl apply -f deploy/namespace.yaml

@echo "\n$(YELLOW)Deploy GSLB operator from $3 $(NC)"
@echo "\n$(YELLOW)Deploy GSLB operator from ${3} $(NC)"
${3:"stable"=""}
$(call deploy-k8gb-with-helm,$1,$2,$3,$4,$5)

@echo "\n$(YELLOW)Deploy Ingress $(NC)"
Expand Down

0 comments on commit 5e0e122

Please sign in to comment.