Skip to content

Commit

Permalink
Merge branch 'master' into fix-grafana
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot authored Jan 12, 2021
2 parents 714f33c + b9c6bae commit c4b9899
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmd/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ func newCompletionCmd() *cobra.Command {
## Load the tiup completion code for bash into the current shell
source <(tiup completion bash)
## Write bash completion code to a file and source if from .bash_profile
tiup completion bash > ~/.completion.bash.inc
tiup completion bash > ~/.tiup.completion.bash
printf "
# tiup shell completion
source '$HOME/.completion.bash.inc'
source '$HOME/.tiup.completion.bash'
" >> $HOME/.bash_profile
source $HOME/.bash_profile
Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/manager/display.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (m *Manager) Display(name string, opt operator.Options) error {
if t, ok := topo.(*spec.Specification); ok {
var err error
dashboardAddr, err = t.GetDashboardAddress(tlsCfg, masterActive...)
if dashboardAddr != "" && err == nil {
if err == nil && !set.NewStringSet("", "auto", "none").Exist(dashboardAddr) {
schema := "http"
if tlsCfg != nil {
schema = "https"
Expand Down
3 changes: 2 additions & 1 deletion pkg/repository/clone_mirror.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@ func cloneComponents(repo *V1Repository,
continue
}
}
if versionItem.Yanked {
if _, err := repo.FetchComponentManifest(name, false); err != nil || versionItem.Yanked {
// The component or the version is yanked, skip download binary
continue
}
if err := download(targetDir, tmpDir, repo, &versionItem); err != nil {
Expand Down

0 comments on commit c4b9899

Please sign in to comment.