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.

Sign up for GitHub

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

Some recent updates #88

Merged
merged 10 commits into from
May 7, 2021
Merged

Some recent updates #88

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8886264
Skip using listers to get object
hangyan Nov 3, 2020
8c3398b
Avoid get old version of object which is marked as deleting
hangyan Nov 4, 2020
5ee385e
Support auto resolve version only once
hangyan Dec 4, 2020
443cc13
Add host ip to event source
hangyan Dec 25, 2020
7046f55
add reason to status of helmrequest
Jan 19, 2021
9d2169d
Merge branch 'cherry-pick-10dd1129' into 'master'
hangyan Mar 1, 2021
aa83702
Merge branch 'cherry-pick-167787f2' into 'master'
hangyan Mar 22, 2021
9a778ac
Merge branch 'cherry-pick-e648d7e0' into 'master'
Mar 24, 2021
65732a6
Merge branch 'fix/upload-charts-conflict' into 'release-3.4'
Mar 25, 2021
5b905b6
Merge branch 'fix/multi-cluster-watch' into 'release-3.4'
hangyan Apr 7, 2021
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
Prev Previous commit
Next Next commit
Merge branch 'cherry-pick-167787f2' into 'master' 
Merge branch 'fix/timeout' into 'release-3.4'

See merge request container-platform/captain!23
  • Loading branch information
@hangyan
hangyan authored and huizhang committed May 6, 2021
commit aa83702a5526102397f70df6d23f3ef6e967959d
2 changes: 2 additions & 0 deletions pkg/helm/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package helm
import (
clientset "github.com/alauda/helm-crds/pkg/client/clientset/versioned"
"strings"
"time"

"github.com/pkg/errors"
"helm.sh/helm/pkg/action"
Expand All @@ -23,6 +24,7 @@ func (d *Deploy) Delete() error {
}

client := action.NewUninstall(cfg)
client.Timeout = 60 * time.Second

res, err := client.Run(name)
if err != nil {
Expand Down