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

[v17] Update references to Kubernetes in cli and error messages #52423

Merged
merged 1 commit into from
Feb 24, 2025
+8 −8
Merged

[v17] Update references to Kubernetes in cli and error messages #52423

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
2 changes: 1 addition & 1 deletion lib/tbot/cli/start_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type KubernetesCommand struct {
// NewKubernetesCommand initializes the command and flags for kubernetes outputs
// and returns a struct to contain the parse result.
func NewKubernetesCommand(parentCmd *kingpin.CmdClause, action MutatorAction, mode CommandMode) *KubernetesCommand {
cmd := parentCmd.Command("kubernetes", fmt.Sprintf("%s tbot with a kubernetes output.", mode)).Alias("k8s")
cmd := parentCmd.Command("kubernetes", fmt.Sprintf("%s tbot with a Kubernetes output.", mode)).Alias("k8s")

c := &KubernetesCommand{}
c.sharedStartArgs = newSharedStartArgs(cmd)
Expand Down
14 changes: 7 additions & 7 deletions tool/tctl/common/resource_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,17 +1027,17 @@ func (rc *ResourceCommand) createKubeCluster(ctx context.Context, client *authcl
if err := client.CreateKubernetesCluster(ctx, cluster); err != nil {
if trace.IsAlreadyExists(err) {
if !rc.force {
return trace.AlreadyExists("kubernetes cluster %q already exists", cluster.GetName())
return trace.AlreadyExists("Kubernetes cluster %q already exists", cluster.GetName())
}
if err := client.UpdateKubernetesCluster(ctx, cluster); err != nil {
return trace.Wrap(err)
}
fmt.Printf("kubernetes cluster %q has been updated\n", cluster.GetName())
fmt.Printf("Kubernetes cluster %q has been updated\n", cluster.GetName())
return nil
}
return trace.Wrap(err)
}
fmt.Printf("kubernetes cluster %q has been created\n", cluster.GetName())
fmt.Printf("Kubernetes cluster %q has been created\n", cluster.GetName())
return nil
}

Expand Down Expand Up @@ -1789,7 +1789,7 @@ func (rc *ResourceCommand) Delete(ctx context.Context, client *authclient.Client
if err != nil {
return trace.Wrap(err)
}
resDesc := "kubernetes cluster"
resDesc := "Kubernetes cluster"
clusters = filterByNameOrDiscoveredName(clusters, rc.ref.Name)
name, err := getOneResourceNameToDelete(clusters, rc.ref, resDesc)
if err != nil {
Expand Down Expand Up @@ -1865,7 +1865,7 @@ func (rc *ResourceCommand) Delete(ctx context.Context, client *authclient.Client
if err != nil {
return trace.Wrap(err)
}
resDesc := "kubernetes server"
resDesc := "Kubernetes server"
servers = filterByNameOrDiscoveredName(servers, rc.ref.Name)
name, err := getOneResourceNameToDelete(servers, rc.ref, resDesc)
if err != nil {
Expand Down Expand Up @@ -2494,7 +2494,7 @@ func (rc *ResourceCommand) getCollection(ctx context.Context, client *authclient
}
servers = filterByNameOrDiscoveredName(servers, rc.ref.Name, altNameFn)
if len(servers) == 0 {
return nil, trace.NotFound("kubernetes server %q not found", rc.ref.Name)
return nil, trace.NotFound("Kubernetes server %q not found", rc.ref.Name)
}
return &kubeServerCollection{servers: servers}, nil

Expand Down Expand Up @@ -2559,7 +2559,7 @@ func (rc *ResourceCommand) getCollection(ctx context.Context, client *authclient
}
clusters = filterByNameOrDiscoveredName(clusters, rc.ref.Name)
if len(clusters) == 0 {
return nil, trace.NotFound("kubernetes cluster %q not found", rc.ref.Name)
return nil, trace.NotFound("Kubernetes cluster %q not found", rc.ref.Name)
}
return &kubeClusterCollection{clusters: clusters}, nil
case types.KindCrownJewel:
Expand Down
Loading