8000 Bump Docker to 19.03.1, Kubernetes to 1.14.0 for smoke tests by bboreham · Pull Request #3687 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Bump Docker to 19.03.1, Kubernetes to 1.14.0 for smoke tests #3687

Merged
merged 7 commits into from
Jul 31, 2020
Merged

Bump Docker to 19.03.1, Kubernetes to 1.14.0 for smoke tests #3687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fab0969
Bump Docker to 19.03.1 for smoke tests
bboreham Aug 14, 2019
3d66dcd
run terraform init for gcp plugin initialization
murali-reddy Jan 29, 2020
f24cf79
build tool updates
murali-reddy Jan 30, 2020
0c4aeb3
Run smoke-tests with Kubernetes 1.14.0 and CNI 0.7.5
murali-reddy Jan 30, 2020
ce9d05e
Allow kubeadm to install on nodes with 1 CPU, for smoke tests
murali-reddy Feb 4, 2020
aa9caab
Fix incompatibility in Docker Python test
bboreham Jul 31, 2020
c50b338
Fix tests where newer Docker returns hex ID of container as network ID
bboreham Jul 31, 2020
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
6 changes: 3 additions & 3 deletions DEPENDENCIES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DOCKER_VERSION=17.06
KUBERNETES_VERSION=1.11.0
KUBERNETES_CNI_VERSION=0.6.0
DOCKER_VERSION=19.03.1
KUBERNETES_VERSION=1.14.0
KUBERNETES_CNI_VERSION=0.7.5
2 changes: 1 addition & 1 deletion test/600_proxy_docker_py.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

. "$(dirname "$0")/config.sh"

IMAGE="weaveworks/docker-py:1.9.0-prime"
IMAGE="weaveworks/docker-py3:1.9.0-prime"

docker_py_test() {
SHARD=$1
Expand Down
12 changes: 6 additions & 6 deletions test/666_abuse_of_start_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ start_suite "Abuse of 'start' operation"

weave_on $HOST1 launch
docker_bridge_ip=$(weave_on $HOST1 docker-bridge-ip)
proxy_start_container $HOST1 --name=c1
id1=$(proxy_start_container $HOST1 --name=c1)

check_hostconfig() {
docker_on $HOST1 attach $1 >/dev/null 2>&1 || true # Wait for container to exit
Expand All @@ -16,12 +16,12 @@ check_hostconfig() {
# Start c2 with a sneaky HostConfig
proxy docker_on $HOST1 create --name=c2 $SMALL_IMAGE $CHECK_ETHWE_UP
proxy docker_api_on $HOST1 POST /containers/c2/start '{"NetworkMode": "container:c1"}'
check_hostconfig c2 container:c1
check_hostconfig c2 "container:$id1"

# Start c5 with a differently sneaky HostConfig
proxy docker_on $HOST1 create --name=c5 $SMALL_IMAGE $CHECK_ETHWE_UP
proxy docker_api_on $HOST1 POST /containers/c5/start '{"HostConfig": {"NetworkMode": "container:c1"}}'
check_hostconfig c5 container:c1
check_hostconfig c5 "container:$id1"

# Start c3 with HostConfig having empty binds and null dns/networking settings
proxy docker_on $HOST1 create --name=c3 -v /tmp:/hosttmp $SMALL_IMAGE $CHECK_ETHWE_UP
Expand All @@ -41,7 +41,7 @@ assert "docker_on $HOST1 inspect -f '{{.HostConfig.MemorySwap}}' c4b" "-1"
# Start c6 with both named and unnamed HostConfig
proxy docker_on $HOST1 create --name=c6 $SMALL_IMAGE $CHECK_ETHWE_UP
proxy docker_api_on $HOST1 POST /containers/c6/start '{"NetworkMode": "container:c2", "HostConfig": {"NetworkMode": "container:c1"}}'
check_hostconfig c6 container:c1
check_hostconfig c6 "container:$id1"

# Start c7 with an empty HostConfig and check this removes previous parameters, but still attaches to weave
proxy docker_on $HOST1 create --name=c7 --memory-swap -1 $SMALL_IMAGE $CHECK_ETHWE_UP
Expand All @@ -55,9 +55,9 @@ proxy docker_api_on $HOST1 POST /containers/c8/start '{"HostConfig": {"NetworkMo
check_hostconfig c8 host

# Start c10 in network of host container
proxy_start_container $HOST1 --name=c9 --net=host
id9=$(proxy_start_container $HOST1 --name=c9 --net=host)
proxy docker_on $HOST1 create --name=c10 $SMALL_IMAGE $CHECK_ETHWE_MISSING
proxy docker_api_on $HOST1 POST /containers/c10/start '{"HostConfig": {"NetworkMode": "container:c9"}}'
check_hostconfig c10 container:c9
check_hostconfig c10 "container:$id9"

end_suite
2 changes: 1 addition & 1 deletion test/840_weave_kube_3_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ k8s_version="$(run_on $HOST1 "kubelet --version" | grep -oP "(?<=Kubernetes )v[\

for host in $HOSTS; do
if [ $host = $HOST1 ] ; then
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN --pod-network-cidr=$WEAVE_NETWORK"
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN --pod-network-cidr=$WEAVE_NETWORK"
else
run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT"
fi
Expand Down
2 changes: 1 addition & 1 deletion test/860_weave_kube_portmap_3_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function setup_kubernetes_cluster {

for host in $HOSTS; do
if [ $host = $HOST1 ] ; then
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN"
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN"
else
run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT"
fi
Expand Down
2 changes: 1 addition & 1 deletion test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function setup_kubernetes_cluster {

for host in $HOSTS; do
if [ $host = $HOST1 ] ; then
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --kubernetes-version=$k8s_version --token=$TOKEN"
run_on $host "sudo systemctl start kubelet && sudo kubeadm init --ignore-preflight-errors=NumCPU --kubernetes-version=$k8s_version --token=$TOKEN"
else
run_on $host "sudo systemctl start kubelet && sudo kubeadm join --token=$TOKEN --discovery-token-unsafe-skip-ca-verification $HOST1IP:$KUBE_PORT"
fi
Expand Down
3 changes: 2 additions & 1 deletion test/run-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ function create_image() {
greenly echo "> Creating GCP image $IMAGE_NAME..."
local begin_img=$(date +%s)
local num_hosts=1
terraform apply -input=false -var "app=$APP" -var "name=$NAME" -var "num_hosts=$num_hosts" "$DIR/../tools/provisioning/gcp"
terraform init "$DIR/../tools/provisioning/gcp"
terraform apply -auto-approve -input=false -var "app=$APP" -var "name=$NAME" -var "num_hosts=$num_hosts" "$DIR/../tools/provisioning/gcp"
configure_with_ansible "$(terraform output username)" "$(terraform output public_ips)," "$(terraform output private_key_path)" $num_hosts
local zone=$(terraform output zone)
local name=$(terraform output instances_names)
Expand Down
2 changes: 1 addition & 1 deletion tools
Open in desktop
Submodule tools updated 3 files
+2 −2 config_management/library/setup_ansible_dependencies.yml
+3 −1 config_management/roles/docker-from-get.docker.com/tasks/debian.yml
+2 −2 config_management/roles/docker-prerequisites/tasks/debian.yml
0