github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix wrong pipe in grep -q

k3s-v1.15.3
Xiangyang Chu 2019-04-26 11:49:04 +08:00
parent 906058bf7b
commit 7a385bf2ea
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/cmd/apply.sh
View File

@ -33,7 +33,7 @@ run_kubectl_apply_tests() {
# Post-Condition: pod "test-pod" is created
kube::test::get_object_assert 'pods test-pod' "{{${labels_field:?}.name}}" 'test-pod-label'
# Post-Condition: pod "test-pod" has configuration annotation
grep -q kubectl.kubernetes.io/last-applied-configuration <<< kubectl get pods test-pod -o yaml "${kube_flags[@]:?}"
grep -q kubectl.kubernetes.io/last-applied-configuration <<< "$(kubectl get pods test-pod -o yaml "${kube_flags[@]:?}")"
# Clean up
kubectl delete pods test-pod "${kube_flags[@]:?}"
@ -46,18 +46,18 @@ run_kubectl_apply_tests() {
# Post-Condition: deployment "test-deployment-retainkeys" created
kube::test::get_object_assert deployments "{{range.items}}{{${id_field:?}}}{{end}}" 'test-deployment-retainkeys'
# Post-Condition: deployment "test-deployment-retainkeys" has defaulted fields
grep -q RollingUpdate <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q maxSurge <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q maxUnavailable <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q emptyDir <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q RollingUpdate <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
grep -q maxSurge <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
grep -q maxUnavailable <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
grep -q emptyDir <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
# Command: apply a deployment "test-deployment-retainkeys" should clear
# defaulted fields and successfully update the deployment
[[ "$(kubectl apply -f hack/testdata/retainKeys/deployment/deployment-after.yaml "${kube_flags[@]:?}")" ]]
# Post-Condition: deployment "test-deployment-retainkeys" has updated fields
grep -q Recreate <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
! grep -q RollingUpdate <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q hostPath <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
! grep -q emptyDir <<< kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}"
grep -q Recreate <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
! grep -q RollingUpdate <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
grep -q hostPath <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
! grep -q emptyDir <<< "$(kubectl get deployments test-deployment-retainkeys -o yaml "${kube_flags[@]:?}")"
# Clean up
kubectl delete deployments test-deployment-retainkeys "${kube_flags[@]:?}"

3
test/cmd/apps.sh
View File

@ -326,8 +326,7 @@ run_deployment_tests() {
newrs="$(kubectl describe deployment nginx | grep NewReplicaSet | awk '{print $2}')"
rs="$(kubectl get rs "${newrs}" -o yaml)"
kube::test::if_has_string "${rs}" "deployment.kubernetes.io/revision: \"6\""
cat hack/testdata/deployment-revision1.yaml | ${SED} "s/name: nginx$/name: nginx2/" | kubectl create -f - "${kube_flags[@]}"
#${SED} "s/name: nginx$/name: nginx2/" hack/testdata/deployment-revision1.yaml | kubectl create -f - "${kube_flags[@]:?}"
${SED} "s/name: nginx$/name: nginx2/" hack/testdata/deployment-revision1.yaml | kubectl create -f - "${kube_flags[@]:?}"
# Deletion of both deployments should not be blocked
kubectl delete deployment nginx2 "${kube_flags[@]:?}"
# Clean up