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 #2193 from carlory/fix-karmadactldescribe 

remove unused flag for karmadactl promote
This commit is contained in:
karmada-bot 2022-07-18 09:36:42 +08:00 committed by GitHub
parent 60c5a64402 a78bc65af5
commit fa4fecaa24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/karmadactl/promote.go
View File

@ -95,9 +95,6 @@ type CommandPromoteOption struct {
// Cluster is the name of legacy cluster // Cluster is the name of legacy cluster
Cluster string Cluster string
// ClusterNamespace holds the namespace name where the member cluster secrets are stored.
ClusterNamespace string
// Namespace is the namespace of legacy resource // Namespace is the namespace of legacy resource
Namespace string Namespace string
@ -129,7 +126,6 @@ func (o *CommandPromoteOption) AddFlags(flags *pflag.FlagSet) {
flags.StringVarP(&o.Namespace, "namespace", "n", "default", "-n=namespace or -n namespace") flags.StringVarP(&o.Namespace, "namespace", "n", "default", "-n=namespace or -n namespace")
flags.StringVarP(&o.Cluster, "cluster", "C", "", "the name of legacy cluster (eg -C=member1)") flags.StringVarP(&o.Cluster, "cluster", "C", "", "the name of legacy cluster (eg -C=member1)")
flags.StringVar(&o.ClusterNamespace, "cluster-namespace", options.DefaultKarmadaClusterNamespace, "Namespace in the control plane where member cluster secrets are stored.")
flags.StringVar(&o.ClusterContext, "cluster-context", "", flags.StringVar(&o.ClusterContext, "cluster-context", "",
"Context name of legacy cluster in kubeconfig. Only works when there are multiple contexts in the kubeconfig.") "Context name of legacy cluster in kubeconfig. Only works when there are multiple contexts in the kubeconfig.")
flags.StringVar(&o.ClusterKubeConfig, "cluster-kubeconfig", "", flags.StringVar(&o.ClusterKubeConfig, "cluster-kubeconfig", "",

22
test/e2e/karmadactl_test.go
View File

@ -84,8 +84,7 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
// Step 2, promote namespace used by the deployment from member1 to karmada // Step 2, promote namespace used by the deployment from member1 to karmada
ginkgo.By(fmt.Sprintf("Promoting namespace %s from member: %s to karmada control plane", deploymentNamespace, member1), func() { ginkgo.By(fmt.Sprintf("Promoting namespace %s from member: %s to karmada control plane", deploymentNamespace, member1), func() {
namespaceOpts = karmadactl.CommandPromoteOption{ namespaceOpts = karmadactl.CommandPromoteOption{
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args := []string{"namespace", deploymentNamespace} args := []string{"namespace", deploymentNamespace}
// init args: place namespace name to CommandPromoteOption.name // init args: place namespace name to CommandPromoteOption.name
@ -102,9 +101,8 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
// Step 3, promote deployment from cluster member1 to karmada // Step 3, promote deployment from cluster member1 to karmada
ginkgo.By(fmt.Sprintf("Promoting deployment %s from member: %s to karmada", deploymentName, member1), func() { ginkgo.By(fmt.Sprintf("Promoting deployment %s from member: %s to karmada", deploymentName, member1), func() {
deploymentOpts = karmadactl.CommandPromoteOption{ deploymentOpts = karmadactl.CommandPromoteOption{
Namespace: deploymentNamespace, Namespace: deploymentNamespace,
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args := []string{"deployment", deploymentName} args := []string{"deployment", deploymentName}
// init args: place deployment name to CommandPromoteOption.name // init args: place deployment name to CommandPromoteOption.name
@ -192,8 +190,7 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
// Step2, promote clusterrole and clusterrolebinding from member1 // Step2, promote clusterrole and clusterrolebinding from member1
ginkgo.By(fmt.Sprintf("Promoting clusterrole %s and clusterrolebindings %s from member to karmada", clusterRoleName, clusterRoleBindingName), func() { ginkgo.By(fmt.Sprintf("Promoting clusterrole %s and clusterrolebindings %s from member to karmada", clusterRoleName, clusterRoleBindingName), func() {
clusterRoleOpts = karmadactl.CommandPromoteOption{ clusterRoleOpts = karmadactl.CommandPromoteOption{
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args := []string{"clusterrole", clusterRoleName} args := []string{"clusterrole", clusterRoleName}
@ -206,8 +203,7 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
clusterRoleBindingOpts = karmadactl.CommandPromoteOption{ clusterRoleBindingOpts = karmadactl.CommandPromoteOption{
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args = []string{"clusterrolebinding", clusterRoleBindingName} args = []string{"clusterrolebinding", clusterRoleBindingName}
@ -259,8 +255,7 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
ginkgo.By(fmt.Sprintf("Promoting namespace %s from member: %s to karmada control plane", serviceNamespace, member1), func() { ginkgo.By(fmt.Sprintf("Promoting namespace %s from member: %s to karmada control plane", serviceNamespace, member1), func() {
opts := karmadactl.CommandPromoteOption{ opts := karmadactl.CommandPromoteOption{
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args := []string{"namespace", serviceNamespace} args := []string{"namespace", serviceNamespace}
err := opts.Complete(args) err := opts.Complete(args)
@ -274,9 +269,8 @@ var _ = ginkgo.Describe("Karmadactl promote testing", func() {
ginkgo.By(fmt.Sprintf("Promoting service %s from member: %s to karmada control plane", serviceName, member1), func() { ginkgo.By(fmt.Sprintf("Promoting service %s from member: %s to karmada control plane", serviceName, member1), func() {
opts := karmadactl.CommandPromoteOption{ opts := karmadactl.CommandPromoteOption{
Namespace: serviceNamespace, Namespace: serviceNamespace,
Cluster: member1, Cluster: member1,
ClusterNamespace: options.DefaultKarmadaClusterNamespace,
} }
args := []string{"service", serviceName} args := []string{"service", serviceName}
err := opts.Complete(args) err := opts.Complete(args)