github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 20:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix kyaml output of watch events

Browse Source
This commit is contained in:
Jordan Liggitt
2026-01-08 12:14:41 -05:00
parent 26fd963327
commit c280c22ea4
2 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/cli-runtime/pkg/printers/kyaml.go
View File

@@ -54,6 +54,8 @@ func (p *KYAMLPrinter) PrintObj(obj runtime.Object, w io.Writer) error {
if InternalObjectPreventer.IsForbidden(reflect.Indirect(reflect.ValueOf(obj.Object.Object)).Type().PkgPath()) {
return errors.New(InternalObjectPrinterErr)
}
return p.encoder.FromObject(obj, w)
case *runtime.Unknown:
return p.encoder.FromYAML(bytes.NewReader(obj.Raw), w)
}

92
staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go
View File

@@ -2584,6 +2584,98 @@ object:
terminationGracePeriodSeconds: 30
status: {}
type: DELETED
`,
},
{
format: "kyaml",
expected: `---
{
type: "ADDED",
object: {
apiVersion: "v1",
kind: "Pod",
metadata: {
name: "bar",
namespace: "test",
resourceVersion: "9",
},
spec: {
containers: null,
dnsPolicy: "ClusterFirst",
enableServiceLinks: true,
restartPolicy: "Always",
securityContext: {},
terminationGracePeriodSeconds: 30,
},
status: {},
},
}
---
{
type: "ADDED",
object: {
apiVersion: "v1",
kind: "Pod",
metadata: {
name: "foo",
namespace: "test",
resourceVersion: "10",
},
spec: {
containers: null,
dnsPolicy: "ClusterFirst",
enableServiceLinks: true,
restartPolicy: "Always",
securityContext: {},
terminationGracePeriodSeconds: 30,
},
status: {},
},
}
---
{
type: "MODIFIED",
object: {
apiVersion: "v1",
kind: "Pod",
metadata: {
name: "foo",
namespace: "test",
resourceVersion: "11",
},
spec: {
containers: null,
dnsPolicy: "ClusterFirst",
enableServiceLinks: true,
restartPolicy: "Always",
securityContext: {},
terminationGracePeriodSeconds: 30,
},
status: {},
},
}
---
{
type: "DELETED",
object: {
apiVersion: "v1",
kind: "Pod",
metadata: {
name: "foo",
namespace: "test",
resourceVersion: "12",
},
spec: {
containers: null,
dnsPolicy: "ClusterFirst",
enableServiceLinks: true,
restartPolicy: "Always",
securityContext: {},
terminationGracePeriodSeconds: 30,
},
status: {},
},
}
`,
},
{