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
bb0c5fea
Commit
bb0c5fea
authored
Feb 05, 2016
by
Janet Kuo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure
parent
7e9fb97b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
test-cmd.sh
hack/test-cmd.sh
+3
-3
deployment_controller.go
pkg/controller/deployment/deployment_controller.go
+1
-1
No files found.
hack/test-cmd.sh
View file @
bb0c5fea
...
...
@@ -678,7 +678,7 @@ runTests() {
kube::test::get_object_assert deployment
"{{range.items}}{{
$id_field
}}:{{end}}"
'nginx:'
# Clean up
kubectl delete deployment nginx
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
deployment.kubernetes.io/podTemplateH
ash
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
pod-template-h
ash
"
${
kube_flags
[@]
}
"
##############
# Namespaces #
...
...
@@ -1102,7 +1102,7 @@ __EOF__
# Clean up
kubectl delete hpa nginx-deployment
"
${
kube_flags
[@]
}
"
kubectl delete deployment nginx-deployment
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
deployment.kubernetes.io/podTemplateH
ash
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
pod-template-h
ash
"
${
kube_flags
[@]
}
"
### Rollback a deployment
# Pre-condition: no deployment exists
...
...
@@ -1131,7 +1131,7 @@ __EOF__
kube::test::get_object_assert deployment
"{{range.items}}{{
$deployment_image_field
}}:{{end}}"
'nginx:latest:'
# Clean up
kubectl delete deployment nginx-deployment
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
deployment.kubernetes.io/podTemplateH
ash
"
${
kube_flags
[@]
}
"
kubectl delete rc
-l
pod-template-h
ash
"
${
kube_flags
[@]
}
"
######################
# ConfigMap #
...
...
pkg/controller/deployment/deployment_controller.go
View file @
bb0c5fea
...
...
@@ -695,7 +695,7 @@ func (dc *DeploymentController) getNewRC(deployment extensions.Deployment, maxOl
namespace
:=
deployment
.
ObjectMeta
.
Namespace
podTemplateSpecHash
:=
podutil
.
GetPodTemplateSpecHash
(
deployment
.
Spec
.
Template
)
newRCTemplate
:=
deploymentutil
.
GetNewRCTemplate
(
deployment
)
// Add pod
TemplateH
ash label to selector.
// Add pod
-template-h
ash label to selector.
newRCSelector
:=
labelsutil
.
CloneAndAddLabel
(
deployment
.
Spec
.
Selector
,
extensions
.
DefaultDeploymentUniqueLabelKey
,
podTemplateSpecHash
)
// Set RC expectations (1 rc should be created)
...
...
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