From 3e6d01f2ad0e79c3a4818254329b9ddb0fca85d5 Mon Sep 17 00:00:00 2001
From: Salah Al Saleh <sg.alsaleh@gmail.com>
Date: Mon, 4 Nov 2024 15:15:56 -0800
Subject: [PATCH] fix: unable to upgrade EC when introducing a required config
 item w/o default or value (#4983)

---
 Makefile                        | 10 ++++++++++
 pkg/upgradeservice/bootstrap.go |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d73c8b4f93..54167dbed4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,16 @@ integration-cli:
 ci-test:
 	go test $(TEST_BUILDFLAGS) ./pkg/... ./cmd/... ./integration/... -coverprofile cover.out
 
+.PHONY: kots-linux-amd64
+kots-linux-amd64: export GOOS = linux
+kots-linux-amd64: export GOARCH = amd64
+kots-linux-amd64: kots
+
+.PHONY: kots-linux-arm64
+kots-linux-arm64: export GOOS = linux
+kots-linux-arm64: export GOARCH = arm64
+kots-linux-arm64: kots
+
 .PHONY: kots
 kots:
 	mkdir -p web/dist
diff --git a/pkg/upgradeservice/bootstrap.go b/pkg/upgradeservice/bootstrap.go
index 954f520831..f238639cd2 100644
--- a/pkg/upgradeservice/bootstrap.go
+++ b/pkg/upgradeservice/bootstrap.go
@@ -133,7 +133,7 @@ func pullArchive(params types.UpgradeServiceParams, pullOptions pull.PullOptions
 	pullOptions.KotsKinds = beforeKotsKinds
 
 	_, err = pull.Pull(fmt.Sprintf("replicated://%s", license.Spec.AppSlug), pullOptions)
-	if err != nil {
+	if err != nil && errors.Cause(err) != pull.ErrConfigNeeded {
 		return errors.Wrap(err, "failed to pull")
 	}