mirror of
https://github.com/rancher/rke.git
synced 2025-09-01 06:56:29 +00:00
Changed Credential Helper to a predefined type ECRCredentialHelper and associated changes for the same
This commit is contained in:
committed by
Kinara Shah
parent
84189fbecc
commit
a618da802b
@@ -54,11 +54,6 @@ func (c *Cluster) ValidateCluster(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// validate registry credential plugin
|
||||
if err := validateRegistryAuthPlugin(c); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// validate services options
|
||||
return validateServicesOptions(c)
|
||||
}
|
||||
@@ -654,19 +649,3 @@ func validateCRIDockerdOption(c *Cluster) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateRegistryAuthPlugin(c *Cluster) error {
|
||||
for _, pr := range c.PrivateRegistriesMap {
|
||||
if len(pr.CredentialPlugin) != 0 {
|
||||
if credPluginType, ok := pr.CredentialPlugin["type"]; ok {
|
||||
switch credPluginType {
|
||||
case "ecr":
|
||||
logrus.Debugf("Plugin type %s is valid", credPluginType)
|
||||
default:
|
||||
return fmt.Errorf("invalid registry plugin helper provided for %s", pr.URL)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user