Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions pkg/app/piped/cloudprovider/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func (p *provider) ApplyManifest(ctx context.Context, manifest Manifest) error {
return p.initErr
}

return p.kubectl.Apply(ctx, p.input.Namespace, manifest)
return p.kubectl.Apply(ctx, p.getNamespaceToRun(manifest.Key), manifest)
}

// Delete deletes the given resource from Kubernetes cluster.
Expand All @@ -244,7 +244,16 @@ func (p *provider) Delete(ctx context.Context, k ResourceKey) (err error) {
return p.initErr
}

return p.kubectl.Delete(ctx, p.input.Namespace, k)
return p.kubectl.Delete(ctx, p.getNamespaceToRun(k), k)
}

// getNamespaceToRun returns namespace used on kubectl apply/delete commands.
// priority: config.KubernetesDeploymentInput > kubernetes.ResourceKey
func (p *provider) getNamespaceToRun(k ResourceKey) string {
if p.input.Namespace != "" {
return p.input.Namespace
}
return k.Namespace
}

func (p *provider) findKubectl(ctx context.Context, version string) (*Kubectl, error) {
Expand Down