Skip to content

Commit

Permalink
fix: unable to upgrade EC when introducing a required config item w/o…
Browse files Browse the repository at this point in the history
… default or value (#4983)
  • Loading branch information
sgalsaleh authored Nov 4, 2024
1 parent eab4439 commit 3e6d01f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/upgradeservice/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down

0 comments on commit 3e6d01f

Please sign in to comment.