Skip to content

K
k3s
Commit 89abb48f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50823 from zjj2wry/set-image

Automatic merge from submit-queue (batch tested with PRs 50277, 50823, 50376, 50867) fix issue(#50821)Add image check, if image not changed, transform false **What this PR does / why we need it**: closes #50821 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents a4f6ae44 a8c68d92
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
hack/make-rules/test-cmd-util.sh
View file @ 89abb48f
...@@ -2848,6 +2848,10 @@ run_deployment_tests() { ...@@ -2848,6 +2848,10 @@ run_deployment_tests() {
kubectl set image deployment nginx-deployment "*"="${IMAGE_DEPLOYMENT_R1}" "${kube_flags[@]}" kubectl set image deployment nginx-deployment "*"="${IMAGE_DEPLOYMENT_R1}" "${kube_flags[@]}"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:" kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_second_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:" kube::test::get_object_assert deployment "{{range.items}}{{$deployment_second_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Set image of all containners of the deployment again when image not change
kubectl set image deployment nginx-deployment "*"="${IMAGE_DEPLOYMENT_R1}" "${kube_flags[@]}"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_second_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Clean up # Clean up
kubectl delete deployment nginx-deployment "${kube_flags[@]}" kubectl delete deployment nginx-deployment "${kube_flags[@]}"
......
pkg/kubectl/cmd/set/set_image.go
View file @ 89abb48f
...@@ -196,11 +196,13 @@ func (o *ImageOptions) Run() error { ...@@ -196,11 +196,13 @@ func (o *ImageOptions) Run() error {
continue continue
} }
} }
if spec.Containers[i].Image != resolved {
spec.Containers[i].Image = resolved spec.Containers[i].Image = resolved
// Perform updates // Perform updates
transformed = true transformed = true
} }
} }
}
// Add a new container if not found // Add a new container if not found
if !containerFound { if !containerFound {
allErrs = append(allErrs, fmt.Errorf("error: unable to find container named %q", name)) allErrs = append(allErrs, fmt.Errorf("error: unable to find container named %q", name))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment