Merge branch 'main' into review-upgrade-guide

aws · Mar 25, 2022 · 7c9e0e2 · 7c9e0e2
2 parents 0b123ac + 72f8c56
commit 7c9e0e2
Show file tree

Hide file tree

Showing 154 changed files with 12,670 additions and 654 deletions.
diff --git a/Makefile b/Makefile
@@ -52,12 +52,17 @@ licenses: ## Verifies dependency licenses and requires GITHUB_TOKEN to be set
 	$(WITH_GOFLAGS) go build -o karpenter cmd/controller/main.go
 	golicense hack/license-config.hcl karpenter
 
-apply: ## Deploy the controller into your ~/.kube/config cluster
+apply: ## Deploy the controller from the current state of your git repository into your ~/.kube/config cluster
 	helm upgrade --install karpenter charts/karpenter --namespace karpenter \
 		$(HELM_OPTS) \
 		--set controller.image=$(shell $(WITH_GOFLAGS) ko build -B github.com/aws/karpenter/cmd/controller) \
 		--set webhook.image=$(shell $(WITH_GOFLAGS) ko build -B github.com/aws/karpenter/cmd/webhook)
 
+install:  ## Deploy the latest released version into your ~/.kube/config cluster
+	@echo Upgrading to $(shell grep version charts/karpenter/Chart.yaml)
+	helm upgrade --install karpenter charts/karpenter --namespace karpenter \
+		$(HELM_OPTS) 
+
 delete: ## Delete the controller from your ~/.kube/config cluster
 	helm uninstall karpenter --namespace karpenter