Skip to content

Commit

Permalink
Update references to Kubernetes in cli and error messages
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenGravy authored and github-actions committed Feb 24, 2025
1 parent 5dcf217 commit b69a772
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/tbot/cli/start_kubernetes.go
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
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

0 comments on commit b69a772

Please sign in to comment.