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: prevent concurrent build to edit the same namespace #6953

Merged
merged 1 commit into from
Apr 3, 2020
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
6 changes: 6 additions & 0 deletions pkg/cmd/step/helm/step_helm_apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@ func (o *StepHelmApplyOptions) Run() error {
defer os.RemoveAll(rootTmpDir)
}

if release, err := kube.AcquireBuildLock(kubeClient, devNs, ns); err != nil {
return errors.Wrapf(err, "fail to acquire the lock")
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)

defer release()
}

// lets use the same child dir name as the original as helm is quite particular about the name of the directory it runs from
_, name := filepath.Split(dir)
if name == "" {
Expand Down
Loading