github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101447 from songxiao-wang87/run-test7

Browse Source 
Modify kubectl command for kube-addons.
This commit is contained in:
Kubernetes Prow Robot 2021-04-26 12:54:19 -07:00 committed by GitHub
commit 503ca529f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cluster/addons/addon-manager/kube-addons-test.sh
View File

@ -83,7 +83,7 @@ EOF
if ! (kubectl get limits/limits -n "${TEST_NS}"); then if ! (kubectl get limits/limits -n "${TEST_NS}"); then
error "failed to create limits w/ reconcile" error "failed to create limits w/ reconcile"
return 1 return 1
elif ! (kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"); then elif ! (kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"); then
error "limits does not match applied config" error "limits does not match applied config"
return 1 return 1
fi fi
@ -92,10 +92,10 @@ EOF
echo_blue "Changes to manifest should be reflected in the cluster" echo_blue "Changes to manifest should be reflected in the cluster"
limitrange="${limitrange//100m/50m}" limitrange="${limitrange//100m/50m}"
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"; then
error "failed to update resource, still has 100m" error "failed to update resource, still has 100m"
return 1 return 1
elif ! (kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "50m"); then elif ! (kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "50m"); then
error "failed to update resource, 50m limit was not reflected" error "failed to update resource, 50m limit was not reflected"
return 1 return 1
fi fi
@ -103,12 +103,12 @@ EOF
# Finally, the users configuration will not be respected. # Finally, the users configuration will not be respected.
echo_blue "Changes the user makes should be overwritten by kube-addon-manager" echo_blue "Changes the user makes should be overwritten by kube-addon-manager"
EDITOR="sed -i 's/50m/600m/'" kubectl edit limits/limits -n ${TEST_NS} EDITOR="sed -i 's/50m/600m/'" kubectl edit limits/limits -n ${TEST_NS}
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "50m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "50m"; then
error "failed to edit resource with sed -- test is broken" error "failed to edit resource with sed -- test is broken"
return 1 return 1
fi fi
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if ! ( kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "50m"); then if ! ( kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "50m"); then
error "failed to update resource, user config was respected when it should have been rewritten" error "failed to update resource, user config was respected when it should have been rewritten"
return 1 return 1
fi fi
@ -137,7 +137,7 @@ EOF
if ! (kubectl get limits/limits -n "${TEST_NS}"); then if ! (kubectl get limits/limits -n "${TEST_NS}"); then
error "failed to create limits w/ EnsureExists" error "failed to create limits w/ EnsureExists"
return 1 return 1
elif ! (kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"); then elif ! (kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"); then
error "limits does not match applied config" error "limits does not match applied config"
return 1 return 1
fi fi
@ -146,7 +146,7 @@ EOF
echo_blue "Changes to the manifest should not be reconciled with the cluster" echo_blue "Changes to the manifest should not be reconciled with the cluster"
limitrange="${limitrange//100m/50m}" limitrange="${limitrange//100m/50m}"
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "50m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "50m"; then
error "failed to respect existing resource, was overwritten despite EnsureExists" error "failed to respect existing resource, was overwritten despite EnsureExists"
return 1 return 1
fi fi
@ -154,12 +154,12 @@ EOF
# the users configuration must be respected # the users configuration must be respected
echo_blue "User configuration will be persisted for EnsureExists" echo_blue "User configuration will be persisted for EnsureExists"
EDITOR="sed -i 's/100m/600m/'" kubectl edit limits/limits -n ${TEST_NS} EDITOR="sed -i 's/100m/600m/'" kubectl edit limits/limits -n ${TEST_NS}
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"; then
error "failed to edit resource with sed -- test is broken" error "failed to edit resource with sed -- test is broken"
return 1 return 1
fi fi
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"; then
error "failed to respect user changes to EnsureExists object" error "failed to respect user changes to EnsureExists object"
return 1 return 1
fi fi
@ -224,7 +224,7 @@ EOF
echo_blue "Multi-resource manifest changes should apply to EnsureExists, not Reconcile" echo_blue "Multi-resource manifest changes should apply to EnsureExists, not Reconcile"
limitrange="${limitrange//100m/50m}" limitrange="${limitrange//100m/50m}"
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "50m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "50m"; then
error "failed to respect existing resource, was overwritten despite EnsureExists" error "failed to respect existing resource, was overwritten despite EnsureExists"
return 1 return 1
elif kubectl get limits/limits2 -n ${TEST_NS} | grep --silent "100m"; then elif kubectl get limits/limits2 -n ${TEST_NS} | grep --silent "100m"; then
@ -235,12 +235,12 @@ EOF
# the users configuration must be respected for EnsureExists # the users configuration must be respected for EnsureExists
echo_blue "Multi-resource manifest should not overwrite user config in EnsureExists" echo_blue "Multi-resource manifest should not overwrite user config in EnsureExists"
EDITOR="sed -i 's/100m/600m/'" kubectl edit limits/limits -n ${TEST_NS} EDITOR="sed -i 's/100m/600m/'" kubectl edit limits/limits -n ${TEST_NS}
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"; then
error "failed to edit resource with sed -- test is broken" error "failed to edit resource with sed -- test is broken"
return 1 return 1
fi fi
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if kubectl get limits/limits -n ${TEST_NS} -oyaml | grep --silent "100m"; then if kubectl get limits/limits -n ${TEST_NS} -o yaml | grep --silent "100m"; then
error "failed to respect user changes to EnsureExists object" error "failed to respect user changes to EnsureExists object"
return 1 return 1
fi fi
@ -248,12 +248,12 @@ EOF
# But not for Reconcile. # But not for Reconcile.
echo_blue "Multi-resource manifest should overwrite user config in EnsureExists" echo_blue "Multi-resource manifest should overwrite user config in EnsureExists"
EDITOR="sed -i 's/50m/600m/'" kubectl edit limits/limits2 -n ${TEST_NS} EDITOR="sed -i 's/50m/600m/'" kubectl edit limits/limits2 -n ${TEST_NS}
if kubectl get limits/limits2 -n ${TEST_NS} -oyaml | grep --silent "50m"; then if kubectl get limits/limits2 -n ${TEST_NS} -o yaml | grep --silent "50m"; then
error "failed to edit resource with sed -- test is broken" error "failed to edit resource with sed -- test is broken"
return 1 return 1
fi fi
create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}" create_resource_from_string "${limitrange}" "10" "1" "limitrange.yaml" "${TEST_NS}"
if ! ( kubectl get limits/limits2 -n ${TEST_NS} -oyaml | grep --silent "50m"); then if ! ( kubectl get limits/limits2 -n ${TEST_NS} -o yaml | grep --silent "50m"); then
error "failed to update resource, user config was respected when it should have been rewritten" error "failed to update resource, user config was respected when it should have been rewritten"
return 1 return 1
fi fi