karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4967 from RainbowMango/pr_remove_deprecated_clusterzone 

Removed deprecated --cluster-zone from karmadactl join command
This commit is contained in:
karmada-bot 2024-05-23 10:40:22 +08:00 committed by GitHub
parent ef14a98242 a0ace65395
commit 8eb4322395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/karmadactl/join/join.go
View File

@ -100,10 +100,6 @@ type CommandJoinOption struct {
// ClusterRegion represents the region of the cluster locate in.
ClusterRegion string
// ClusterZone represents the zone of the cluster locate in.
// Deprecated: Use ClusterZones instead.
ClusterZone string
// ClusterZones represents the failure zones(also called availability zones) of the
// member cluster. The zones are presented as a slice to support the case
// that cluster runs across multiple failure zones.
@ -141,9 +137,6 @@ func (j *CommandJoinOption) Validate(args []string) error {
klog.Warningf("karmada-system is always reserved for Karmada control plane. We do not recommend using karmada-system to store secrets of member clusters. It may cause mistaken cleanup of resources.")
}
if j.ClusterZone != "" && len(j.ClusterZones) > 0 {
return fmt.Errorf("--cluster-zone and --cluster-zones can not co-exist")
}
return nil
}
@ -156,9 +149,6 @@ func (j *CommandJoinOption) AddFlags(flags *pflag.FlagSet) {
"Path of the cluster's kubeconfig.")
flags.StringVar(&j.ClusterProvider, "cluster-provider", "", "Provider of the joining cluster. The Karmada scheduler can use this information to spread workloads across providers for higher availability.")
flags.StringVar(&j.ClusterRegion, "cluster-region", "", "The region of the joining cluster. The Karmada scheduler can use this information to spread workloads across regions for higher availability.")
flags.StringVar(&j.ClusterZone, "cluster-zone", "", "The zone of the joining cluster.")
// nolint: errcheck
flags.MarkDeprecated("cluster-zone", "This flag is deprecated and will be removed in future releases. Use --cluster-zones instead.")
flags.StringSliceVar(&j.ClusterZones, "cluster-zones", nil, "The zones of the joining cluster. The Karmada scheduler can use this information to spread workloads across zones for higher availability.")
flags.BoolVar(&j.DryRun, "dry-run", false, "Run the command in dry-run mode, without making any server requests.")
}
@ -198,7 +188,6 @@ func (j *CommandJoinOption) RunJoinCluster(controlPlaneRestConfig, clusterConfig
ReportSecrets: []string{util.KubeCredentials, util.KubeImpersonator},
ClusterProvider: j.ClusterProvider,
ClusterRegion: j.ClusterRegion,
ClusterZone: j.ClusterZone,
ClusterZones: j.ClusterZones,
DryRun: j.DryRun,
ControlPlaneConfig: controlPlaneRestConfig,
@ -259,10 +248,6 @@ func generateClusterInControllerPlane(opts util.ClusterRegisterOption) (*cluster
clusterObj.Spec.Provider = opts.ClusterProvider
}
if opts.ClusterZone != "" {
clusterObj.Spec.Zone = opts.ClusterZone
}
if len(opts.ClusterZones) > 0 {
clusterObj.Spec.Zones = opts.ClusterZones
}

6
pkg/util/cluster.go
View File

@ -57,10 +57,8 @@ type ClusterRegisterOption struct {
ProxyServerAddress string
ClusterProvider string
ClusterRegion string
// Deprecated: Use ClusterZones instead.
ClusterZone string
ClusterZones []string
DryRun bool
ClusterZones []string
DryRun bool
ControlPlaneConfig *rest.Config
ClusterConfig *rest.Config