Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kinder: fix a bug related to --only-node usage #2990

Merged
merged 1 commit into from
Jan 9, 2024
Merged

kinder: fix a bug related to --only-node usage #2990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker
- --only-node=kinder-discovery-worker-1
- --discovery-mode=file
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -77,7 +77,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker2
- --only-node=kinder-discovery-worker-2
- --discovery-mode=file-with-token
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -90,7 +90,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker3
- --only-node=kinder-discovery-worker-3
- --discovery-mode=file-with-embedded-client-certificates
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -103,7 +103,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker4
- --only-node=kinder-discovery-worker-4
- --discovery-mode=file-with-external-client-certificates
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand Down
8 changes: 4 additions & 4 deletions kinder/ci/workflows/discovery-tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker
- --only-node=kinder-discovery-worker-1
- --discovery-mode=file
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -78,7 +78,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker2
- --only-node=kinder-discovery-worker-2
- --discovery-mode=file-with-token
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -91,7 +91,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker3
- --only-node=kinder-discovery-worker-3
- --discovery-mode=file-with-embedded-client-certificates
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand All @@ -104,7 +104,7 @@ tasks:
- do
- kubeadm-join
- --name={{ .vars.clusterName }}
- --only-node=kinder-discovery-worker4
- --only-node=kinder-discovery-worker-4
- --discovery-mode=file-with-external-client-certificates
- --loglevel=debug
- --kubeadm-verbosity={{ .vars.kubeadmVerbosity }}
Expand Down
4 changes: 3 additions & 1 deletion kinder/cmd/kinder/do/do.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ func runE(flags *flagpole, cmd *cobra.Command, args []string) (err error) {

// eventually, instruct the cluster manager to run only commands on one node
if flags.OnlyNode != "" {
o.OnlyNode(flags.OnlyNode)
if err := o.OnlyNode(flags.OnlyNode); err != nil {
return err
}
}

// eventually, instruct the cluster manager to dry run commands (without actually running them)
Expand Down
14 changes: 11 additions & 3 deletions kinder/pkg/cluster/manager/manage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,20 @@ func (c *ClusterManager) DryRun() {
}

// OnlyNode instruct the cluster manager to run only commands on one node
func (c *ClusterManager) OnlyNode(node string) {
func (c *ClusterManager) OnlyNode(node string) error {
found := false
for _, n := range c.Cluster.AllNodes() {
if n.Name() != node {
n.SkipActions()
if n.Name() == node {
log.Infof("Found matching node for --only-node: %s", node)
found = true
continue
}
n.SkipActions()
}
if !found {
return errors.Errorf("did not find a matching node for --only-node: %s", node)
}
return nil
}

// DoAction actions on kind(er) cluster
Expand Down