fix(installer): skip docker login when no username

Signed-off-by: Tengfei Wang <[email protected]>
leoryu · Sep 21, 2020 · 515bcc6 · 515bcc6
1 parent 2863056
commit 515bcc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/tke-installer/app/installer/installer.go b/cmd/tke-installer/app/installer/installer.go
@@ -695,7 +695,7 @@ func (t *TKE) validateConfig(config types.Config) *apierrors.StatusError {
  return apierrors.NewBadRequest("tke registry or third party registry required")
  }
 
- if config.Registry.ThirdPartyRegistry != nil {
+ if config.Registry.ThirdPartyRegistry != nil && config.Registry.ThirdPartyRegistry.Username != "" {
  cmd := exec.Command("docker", "login",
  "--username", config.Registry.ThirdPartyRegistry.Username,
  "--password", string(config.Registry.ThirdPartyRegistry.Password),

diff --git a/cmd/tke-installer/app/installer/types/types.go b/cmd/tke-installer/app/installer/types/types.go
@@ -118,8 +118,8 @@ type TKERegistry struct {
 type ThirdPartyRegistry struct {
  Domain string `json:"domain" validate:"required"`
  Namespace string `json:"namespace" validate:"required"`
- Username string `json:"username" validate:"required"`
- Password []byte `json:"password" validate:"required"`
+ Username string `json:"username"`
+ Password []byte `json:"password"`
 }
 
 type Business struct {