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
7d3d7846
Commit
7d3d7846
authored
Jun 25, 2016
by
k8s-merge-robot
Committed by
GitHub
Jun 25, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #27902 from caesarxuchao/fix-test-cmd
Automatic merge from submit-queue fix test-cmd multi-resource test See inline descriptions.
parents
1effc5af
27f4eca5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
test-cmd.sh
hack/test-cmd.sh
+1
-1
multi-resource-yaml-modify.yaml
hack/testdata/multi-resource-yaml-modify.yaml
+2
-0
multi-resource-yaml.yaml
hack/testdata/multi-resource-yaml.yaml
+2
-0
No files found.
hack/test-cmd.sh
View file @
7d3d7846
...
...
@@ -2059,7 +2059,7 @@ __EOF__
fi
kubectl describe
-f
"
${
file
}
"
"
${
kube_flags
[@]
}
"
# Command
kubectl replace
-f
$replace_file
--force
"
${
kube_flags
[@]
}
"
kubectl replace
-f
$replace_file
--force
--cascade
"
${
kube_flags
[@]
}
"
# Post-condition: mock service (and mock2) and mock rc (and mock2) are replaced
if
[
"
$has_svc
"
=
true
]
;
then
kube::test::get_object_assert
'services mock'
"{{
${
labels_field
}
.status}}"
'replaced'
...
...
hack/testdata/multi-resource-yaml-modify.yaml
View file @
7d3d7846
...
...
@@ -19,6 +19,8 @@ metadata:
name
:
mock
spec
:
replicas
:
1
selector
:
app
:
mock
template
:
metadata
:
labels
:
...
...
hack/testdata/multi-resource-yaml.yaml
View file @
7d3d7846
...
...
@@ -18,6 +18,8 @@ metadata:
name
:
mock
spec
:
replicas
:
1
selector
:
app
:
mock
template
:
metadata
:
labels
:
...
...
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