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.

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

fix: unable to upgrade EC when introducing a required config item w/o default or value #4983

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading