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

diff: Fix crash when remote object doesn't exist

Browse Source 
Since we're saving nil in an interface rather than the implementation,
we can't compare to nil to check if the remote object exists or
not. Change the struct to save in the implementation.
This commit is contained in:
Antoine Pelisse 2018-08-22 05:51:26 -07:00
parent 0e31372b2f
commit a3417fe62c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/diff.go
View File

@ -265,7 +265,7 @@ type Object interface {
// InfoObject is an implementation of the Object interface. It gets all // InfoObject is an implementation of the Object interface. It gets all
// the information from the Info object. // the information from the Info object.
type InfoObject struct { type InfoObject struct {
Remote runtime.Unstructured Remote *unstructured.Unstructured
Info *resource.Info Info *resource.Info
Encoder runtime.Encoder Encoder runtime.Encoder
Parser *parse.Factory Parser *parse.Factory

4
test/cmd/diff.sh
View File

@ -26,6 +26,10 @@ run_kubectl_diff_tests() {
create_and_use_new_namespace create_and_use_new_namespace
kube::log::status "Testing kubectl alpha diff" kube::log::status "Testing kubectl alpha diff"
# Test that it works when the live object doesn't exist
output_message=$(kubectl alpha diff LOCAL LIVE -f hack/testdata/pod.yaml)
kube::test::if_has_string "${output_message}" 'test-pod'
kubectl apply -f hack/testdata/pod.yaml kubectl apply -f hack/testdata/pod.yaml
# Ensure that selfLink has been added, and shown in the diff # Ensure that selfLink has been added, and shown in the diff