github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67707 from apelisse/fix-diff-404

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

diff: Fix crash when remote object doesn't exist

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.



**What this PR does / why we need it**:

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-23 15:32:14 -07:00 committed by GitHub
commit 501e3f7e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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