Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Update ci and tests scripts for kubernetes 1.12 #926

Merged
merged 5 commits into from
Nov 23, 2018

Conversation

chavafg
Copy link
Contributor

@chavafg chavafg commented Nov 21, 2018

Commits:

  • cri-o: modify crio.conf to match new format
  • k8s: Update scripts for Kubernetes 1.12
  • k8s: use annotation tags and new kubectl wait

@chavafg
Copy link
Contributor Author

chavafg commented Nov 21, 2018

/test

@chavafg chavafg force-pushed the topic/changes-k8s-1.12 branch 5 times, most recently from 65c00ed to 2d9f46a Compare November 22, 2018 03:03
Copy link
Contributor

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question ;)

@@ -5,7 +5,9 @@
# SPDX-License-Identifier: Apache-2.0
#

set -e
set -o errexit
set -o nounset
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice ;)

# This instruction will wait until it is up and running, so we can
# start creating our containers.
dns_wait_time=300
dns_wait_time=120
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not really clear on this change - if it takes ~2 minutes to start, why are we reducing the time we wait in case it takes a little longer?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, it is actually taking less than 2 minutes, so I wanted to try reducing the time from 300s. So far it has been working well with the 2 minutes timeout.

@jodh-intel
Copy link
Contributor

jodh-intel commented Nov 22, 2018

lgtm

Approved with PullApprove

@chavafg chavafg force-pushed the topic/changes-k8s-1.12 branch from 3b88660 to 7a20e0a Compare November 22, 2018 17:02
@chavafg
Copy link
Contributor Author

chavafg commented Nov 22, 2018

/test

chavafg added a commit to chavafg/runtime-1 that referenced this pull request Nov 22, 2018
Update supported versions of Kubernetes with its
corresponding CRI implementations:

- Kubernetes from 1.10.5 to 1.12.2
- cri-o from 1.10 to 1.12.0, commit:
  fa540c8e806d28c2cbcd157bdf8acf2b20990ab6 as it is needed
  for fixing the devicemapper issues when removing a pod.
  More info on this issue, see:
  cri-o/cri-o#1883
- containerd from 1.1.3 to 1.2.0

Fixes: kata-containers#927.

Depends-on: github.com/kata-containers/tests#926

Signed-off-by: Salvador Fuentes <[email protected]>
crio.conf has changed its format in the 1.12 version.
Change our scripts to match this new format.

Signed-off-by: Salvador Fuentes <[email protected]>
Update init and cleanup scripts.
- Use updated flannel config file, taken from the
  documentation documents, which is now downloaded from
  the coreos/flannel repository.
- Use a yaml configuration file to initialize kubeadm.
- Remove workaround to delete pods after the kubeadm reset.

Fixes: kata-containers#925.
Fixes: kata-containers#296.

Signed-off-by: Salvador Fuentes <[email protected]>
Add untrusted annotation tags to the pod configuration files
and use the `kubectl wait` instead of our `waitForProcess` script
to know if a pod is running.

Depends-on: github.com/kata-containers/runtime#928

Signed-off-by: Salvador Fuentes <[email protected]>
The tests that verify the uts and ipc namespaces and the
CPU test using containerd work well on k8s 1.12.

Fixes: kata-containers#793.
Fixes: kata-containers#794.

Signed-off-by: Salvador Fuentes <[email protected]>
@chavafg chavafg force-pushed the topic/changes-k8s-1.12 branch 2 times, most recently from a126b65 to 18c593d Compare November 22, 2018 19:05
@chavafg
Copy link
Contributor Author

chavafg commented Nov 22, 2018

/test

Remove kubernetes packages and configuration when running
on baremetal machines.

Signed-off-by: Salvador Fuentes <[email protected]>
@chavafg chavafg force-pushed the topic/changes-k8s-1.12 branch from 18c593d to 4ff6bc6 Compare November 22, 2018 22:26
@chavafg
Copy link
Contributor Author

chavafg commented Nov 22, 2018

/test

@bergwolf
Copy link
Member

Nice! Thanks @chavafg !

LGTM

@teawater
Copy link
Member

teawater commented Nov 23, 2018

lgtm

Approved with PullApprove

@teawater teawater merged commit 3231724 into kata-containers:master Nov 23, 2018
@chavafg chavafg deleted the topic/changes-k8s-1.12 branch February 14, 2019 20:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants