Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kinder: add test for patching kubeletconfiguration; cleanup test jobs #2707

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions kinder/ci/tools/update-workflows/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ jobGroups:
- ./templates/workflows/patches-tasks.yaml
jobs:
- kubernetesVersion: latest
- kubernetesVersion: 0
- kubernetesVersion: -1
- kubernetesVersion: -2
- kubernetesVersion: -3

- name: presubmit-upgrade-latest
kinderWorkflowSpec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ tasks:
cat <<EOF >/tmp/kubeadm-patches/etcd+json.json
[{"op":"add","path":"/metadata/annotations/patched","value":"true"}]
EOF

cat <<EOF >/tmp/kubeadm-patches/kubeletconfiguration+strategic.yaml
shutdownGracePeriod: 1s
EOF
- name: prepare verify-patches.sh script
cmd: /bin/sh
args:
Expand All @@ -88,6 +92,13 @@ tasks:
fi
done

if grep -q "shutdownGracePeriod: 1s" /var/lib/kubelet/config.yaml ; then
echo "/var/lib/kubelet/config.yaml is patched!"
else
echo "ERROR: /var/lib/kubelet/config.yaml is not patched"
res=1
fi

if [[ "\${res}" = 0 ]]; then
echo "All verify checks passed, congrats!"
echo ""
Expand Down
10 changes: 0 additions & 10 deletions kinder/ci/workflows/patches-1.21.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions kinder/ci/workflows/patches-1.22.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions kinder/ci/workflows/patches-1.23.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions kinder/ci/workflows/patches-1.24.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions kinder/ci/workflows/patches-tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ tasks:
cat <<EOF >/tmp/kubeadm-patches/etcd+json.json
[{"op":"add","path":"/metadata/annotations/patched","value":"true"}]
EOF

cat <<EOF >/tmp/kubeadm-patches/kubeletconfiguration+strategic.yaml
shutdownGracePeriod: 1s
EOF
- name: prepare verify-patches.sh script
cmd: /bin/sh
args:
Expand All @@ -89,6 +93,13 @@ tasks:
fi
done

if grep -q "shutdownGracePeriod: 1s" /var/lib/kubelet/config.yaml ; then
echo "/var/lib/kubelet/config.yaml is patched!"
else
echo "ERROR: /var/lib/kubelet/config.yaml is not patched"
res=1
fi

if [[ "\${res}" = 0 ]]; then
echo "All verify checks passed, congrats!"
echo ""
Expand Down