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

Jump to bottom

Bug 1947430: Revert "Bug 1812813: oc debug node: create debug namespace" #808

Merged
merged 1 commit into from
Apr 30, 2021
Merged

Bug 1947430: Revert "Bug 1812813: oc debug node: create debug namespace" #808

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 0 additions & 39 deletions pkg/cli/debug/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/cli-runtime/pkg/resource"
Expand Down Expand Up @@ -378,49 +377,11 @@ func (o *DebugOptions) RunDebug() error {
if err != nil {
klog.V(4).Infof("Unable to get exact template, but continuing with fallback: %v", err)
}
var debugNodeNS *corev1.Namespace
generateName := names.SimpleNameGenerator.GenerateName("openshift-debug-node-")
// create namespace only if debugging a node
if o.IsNode && len(o.ToNamespace) == 0 && !o.ExplicitNamespace {
if !o.Attach.Quiet {
fmt.Fprintf(o.ErrOut, "Creating debug namespace/%s ...\n", generateName)
}
debugNodeNS, err = o.CoreClient.Namespaces().Create(context.TODO(), &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
GenerateName: generateName,
Labels: map[string]string{
"openshift.io/run-level": "0",
},
Annotations: map[string]string{
"openshift.io/node-selector": "",
},
},
}, metav1.CreateOptions{})
if err != nil {
return err
}
}
defer func() {
if debugNodeNS != nil {
if !o.Attach.Quiet {
fmt.Fprintf(o.ErrOut, "Removing debug namespace/%s ...\n", generateName)
}

if err := o.CoreClient.Namespaces().Delete(context.TODO(), debugNodeNS.Name, metav1.DeleteOptions{}); err != nil {
fmt.Fprintf(o.ErrOut, "%v\n", err)
return
}
}
}()

pod := &corev1.Pod{
ObjectMeta: template.ObjectMeta,
Spec: template.Spec,
}
ns := infos[0].Namespace
if debugNodeNS != nil {
ns = debugNodeNS.Name
}
if len(ns) == 0 {
ns = o.Namespace
}
Expand Down