Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
95eec905
Commit
95eec905
authored
Dec 11, 2018
by
Antoine Pelisse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
diff: Make filename cross-platform compatible
parent
b6135f63
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
diff.go
pkg/kubectl/cmd/diff/diff.go
+1
-1
diff.sh
test/cmd/diff.sh
+4
-4
No files found.
pkg/kubectl/cmd/diff/diff.go
View file @
95eec905
...
@@ -294,7 +294,7 @@ func (obj InfoObject) Name() string {
...
@@ -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
,
...
...
test/cmd/diff.sh
View file @
95eec905
...
@@ -49,10 +49,10 @@ run_kubectl_diff_same_names() {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment