Skip to content

Commit

Permalink
Update k8s-multus and openshift-multus providers
Browse files Browse the repository at this point in the history
Also update multus ovs and cni plugins images, to support new features.
  • Loading branch information
SchSeba committed Feb 21, 2019
1 parent 31d08ef commit 5864865
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions automation/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ if [[ $TARGET =~ openshift-.* ]]; then
fi
elif [[ $TARGET =~ .*-1.10.4 ]]; then
export KUBEVIRT_PROVIDER="k8s-1.10.11"
elif [[ $TARGET =~ .*-multus-1.12.2 ]]; then
export KUBEVIRT_PROVIDER="k8s-multus-1.12.2"
elif [[ $TARGET =~ .*-multus-1.13.3 ]]; then
export KUBEVIRT_PROVIDER="k8s-multus-1.13.3"
elif [[ $TARGET =~ .*-genie-1.11.1 ]]; then
export KUBEVIRT_PROVIDER="k8s-genie-1.11.1"
else
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kubernetes 1.12.2 with multus network plugin in ephemeral containers
# Kubernetes 1.13.3 with multus network plugin in ephemeral containers

Provides a pre-deployed Kubernetes with version 1.12.2 purely in docker
Provides a pre-deployed Kubernetes with version 1.13.3 purely in docker
containers with qemu. The provided VMs are completely ephemeral and are
recreated on every cluster restart. The KubeVirt containers are built on the
local machine and are the pushed to a registry which is exposed at
Expand All @@ -9,7 +9,7 @@ local machine and are the pushed to a registry which is exposed at
## Bringing the cluster up

```bash
export KUBEVIRT_PROVIDER=k8s-multus-1.12.2
export KUBEVIRT_PROVIDER=k8s-multus-1.13.3
export KUBEVIRT_NUM_NODES=2 # master + one node
make cluster-up
```
Expand All @@ -19,14 +19,14 @@ The cluster can be accessed as usual:
```bash
$ cluster/kubectl.sh get nodes
NAME STATUS ROLES AGE VERSION
node01 NotReady master 31s v1.12.2
node02 NotReady <none> 5s v1.12.2
node01 NotReady master 31s v1.13.3
node02 NotReady <none> 5s v1.13.3
```

## Bringing the cluster down

```bash
export KUBEVIRT_PROVIDER=k8s-multus-1.12.2
export KUBEVIRT_PROVIDER=k8s-multus-1.13.3
make cluster-down
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

image="k8s-multus-1.12.2@sha256:4974496beb19a30156c125d7721912b54a705926dcbf66c41f570dca286996ba"
image="k8s-multus-1.13.3@sha256:d562b9c7d0192fdf7b2570887d05191bc7ecbf75555b5bc0ddb9782eab5a7517"

source cluster/ephemeral-provider-common.sh

Expand Down
2 changes: 1 addition & 1 deletion cluster/os-3.11.0-multus/provider.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -e

source cluster/os-3.11.0/provider.sh

image="os-3.11.0-multus@sha256:46155f973cb4637be5f73cf0307bb09e4caf5c66bd921cf5d1988db2598a8995"
image="os-3.11.0-multus@sha256:3e962ef5042e6e03a25eea263d7474dd63e65e809d8d7b6ac3cf349e10dc13d9"
2 changes: 1 addition & 1 deletion stdci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sub-stages:
timeout: 4h
- k8s-1.11.0:
timeout: 4h
- k8s-multus-1.12.2
- k8s-multus-1.13.3
- k8s-genie-1.11.1
- openshift-3.11:
timeout: 4h
Expand Down

0 comments on commit 5864865

Please sign in to comment.