github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

diff: Make filename cross-platform compatible

pull/564/head
Antoine Pelisse 2018-12-11 15:32:46 -08:00
parent b6135f63aa
commit 95eec905c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ func (obj InfoObject) Name() string {
group = fmt.Sprintf("%v.", obj.Info.Mapping.GroupVersionKind.Group) group = fmt.Sprintf("%v.", obj.Info.Mapping.GroupVersionKind.Group)
} }
return group + fmt.Sprintf( return group + fmt.Sprintf(
"%v.%v:%v.%v", "%v.%v.%v.%v",
obj.Info.Mapping.GroupVersionKind.Version, obj.Info.Mapping.GroupVersionKind.Version,
obj.Info.Mapping.GroupVersionKind.Kind, obj.Info.Mapping.GroupVersionKind.Kind,
obj.Info.Namespace, obj.Info.Namespace,

8
test/cmd/diff.sh
View File

@ -49,10 +49,10 @@ run_kubectl_diff_same_names() {
kube::log::status "Test kubectl diff with multiple resources with the same name" kube::log::status "Test kubectl diff with multiple resources with the same name"
output_message=$(KUBECTL_EXTERNAL_DIFF=find kubectl diff -Rf hack/testdata/diff/) output_message=$(KUBECTL_EXTERNAL_DIFF=find kubectl diff -Rf hack/testdata/diff/)
kube::test::if_has_string "${output_message}" 'v1.Pod:.*.test' kube::test::if_has_string "${output_message}" 'v1\.Pod\..*\.test'
kube::test::if_has_string "${output_message}" 'apps.v1.Deployment:.*.test' kube::test::if_has_string "${output_message}" 'apps\.v1\.Deployment\..*\.test'
kube::test::if_has_string "${output_message}" 'v1.ConfigMap:.*.test' kube::test::if_has_string "${output_message}" 'v1\.ConfigMap\..*\.test'
kube::test::if_has_string "${output_message}" 'v1.Secret:.*.test' kube::test::if_has_string "${output_message}" 'v1\.Secret\..*\.test'
set +o nounset set +o nounset
set +o errexit set +o errexit