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

Machine ID: Render kubernetes template without exec plugin when using non-directory destination #43401

Merged
merged 6 commits into from
Jun 25, 2024
Merged

Machine ID: Render kubernetes template without exec plugin when using non-directory destination #43401

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c73147
Render kubernetes template without exec plugin when using non-directo…
strideynet Jun 24, 2024
b8d7556
Switch to info level for warning
strideynet Jun 24, 2024
36c4a09
Update lib/tbot/config/template_kubernetes.go
strideynet Jun 25, 2024
c468a2e
Address review feedback
strideynet Jun 25, 2024
d4e1514
Merge branch 'master' into strideynet/output-kubernetes-template-with…
strideynet Jun 25, 2024
98dc4af
Merge branch 'master' into strideynet/output-kubernetes-template-with…
strideynet Jun 25, 2024
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
16 changes: 8 additions & 8 deletions lib/tbot/config/template_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ func (t *templateKubernetes) render(
kubernetesClusterName: t.clusterName,
}

destinationDir, isDirectoryDest := destination.(*DestinationDirectory)
if !t.disableExecPlugin {
if !isDirectoryDest {
log.WarnContext(ctx, "Kubernetes template will be rendered without exec plugin because destination is not a directory. Explicitly set `disable_exec_plugin: true` in the output to suppress this message")
strideynet marked this conversation as resolved.
Show resolved Hide resolved
t.disableExecPlugin = true
}
}

var cfg *clientcmdapi.Config
if t.disableExecPlugin {
// If they've disabled the exec plugin, we just write the credentials
Expand All @@ -216,14 +224,6 @@ func (t *templateKubernetes) render(
// We only support directory mode for this since the exec plugin needs
// to know the path to read the credentials from, and this is
// unpredictable with other types of destination.
strideynet marked this conversation as resolved.
Show resolved Hide resolved
destinationDir, ok := destination.(*DestinationDirectory)
if !ok {
return trace.BadParameter(
"Destination %s must be a directory in exec plugin mode",
destination,
)
}

executablePath, err := t.executablePathGetter()
if err != nil {
return trace.Wrap(err)
Expand Down
Loading