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

Show file tree
Hide file tree
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-e648d7e0' into 'master' 
Merge branch 'fix/retry-upgrade-cr' into 'release-3.4'

See merge request container-platform/captain!26
  • Loading branch information
张辉 committed May 6, 2021
commit 9a778ac03d8924ad72f325a67629e5cfaa9db9a1
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/alauda/captain

go 1.13

replace helm.sh/helm => github.com/alauda/helm v3.0.0-beta.3.0.20200930054109-26ea4370a9cf+incompatible
replace helm.sh/helm => github.com/alauda/helm v3.0.0-beta.3.0.20210324054531-a2266d7d8572+incompatible

replace github.com/alauda/helm-crds => github.com/alauda/helm-crds v0.0.0-20210119064602-a9b3bd3f1a75

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ github.com/alauda/component-base v0.0.0-20190628064654-a4dafcfd3446 h1:gtzuHCPUR
github.com/alauda/component-base v0.0.0-20190628064654-a4dafcfd3446/go.mod h1:tbaXeIWDl6zX1b7O53FSXClDS1YmEDRnVJszgcLXzpk=
github.com/alauda/component-base v0.0.0-20200924035615-566770b62a9f h1:6hr5oCOHGim9vAeiY/0DI1xMbHY0nBkpMkRfToOQHFU=
github.com/alauda/component-base v0.0.0-20200924035615-566770b62a9f/go.mod h1:tbaXeIWDl6zX1b7O53FSXClDS1YmEDRnVJszgcLXzpk=
github.com/alauda/helm v3.0.0-beta.3.0.20201109103011-0c97bed40270+incompatible h1:uXx1/FTLtA4EuxZDLVJg2vMEBEqCjTHCfX/jrCnNOKI=
github.com/alauda/helm v3.0.0-beta.3.0.20201109103011-0c97bed40270+incompatible/go.mod h1:puN71hQ/dtLbcyDOPyhZw19FrLSYCak3EvJBT2OaRvQ=
github.com/alauda/helm v3.0.0-beta.3.0.20210324054531-a2266d7d8572+incompatible h1:xYfXH5GH7iSBPsE809Jpzlz21r2pMWS8frLfVZ93rsE=
github.com/alauda/helm v3.0.0-beta.3.0.20210324054531-a2266d7d8572+incompatible/go.mod h1:puN71hQ/dtLbcyDOPyhZw19FrLSYCak3EvJBT2OaRvQ=
github.com/alauda/helm-crds v0.0.0-20210119064602-a9b3bd3f1a75 h1:nK9J+jVULuRXqwaMXCXXjC2++n/eNT7dnBKpASA4NTQ=
github.com/alauda/helm-crds v0.0.0-20210119064602-a9b3bd3f1a75/go.mod h1:QzPKCROcmAchx7bBj6NrNM34bmMQCrJCb+GrXtYi72o=
github.com/alauda/vcs v1.13.2-0.20200311111907-acd482b1ae9a h1:tehWJjvfLunaJmmfcrxGP/1fPpASusJmLjm+RcP67Vc=
Expand Down