Skip to content

Commit

Permalink
Enable subresource feature-gate on the 1.10 cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
rmohr committed Dec 31, 2018
1 parent 0b8511d commit e47b969
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion automation/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [[ $TARGET =~ openshift-.* ]]; then
export KUBEVIRT_PROVIDER="os-3.11.0"
fi
elif [[ $TARGET =~ .*-1.10.4-.* ]]; then
export KUBEVIRT_PROVIDER="k8s-1.10.4"
export KUBEVIRT_PROVIDER="k8s-1.10.11"
elif [[ $TARGET =~ .*-multus-1.12.2-.* ]]; then
export KUBEVIRT_PROVIDER="k8s-multus-1.12.2"
elif [[ $TARGET =~ .*-genie-1.11.1-.* ]]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-1.10.4
export KUBEVIRT_PROVIDER=k8s-1.10.11
export KUBEVIRT_NUM_NODES=2 # master + one nodes
make cluster-up
```
Expand All @@ -26,7 +26,7 @@ node02 NotReady <none> 5s v1.10.4
## Bringing the cluster down

```bash
export KUBEVIRT_PROVIDER=k8s-1.10.4
export KUBEVIRT_PROVIDER=k8s-1.10.11
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-1.10.4@sha256:b60a61ca03a1a6c504481020709a04f65e4dd9c929a8bcad18821c5f80d1b2b6"
image="k8s-1.10.11@sha256:b97e556795a56b9aa1763ddf3a49322b49f96877dccb7a164bbca779df078536"

source cluster/ephemeral-provider-common.sh

Expand Down
4 changes: 2 additions & 2 deletions docs/env-providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Requires:
Usage:

```bash
export KUBEVIRT_PROVIDER=k8s-1.10.4 # choose this provider
export KUBEVIRT_PROVIDER=k8s-1.10.11 # choose this provider
export KUBEVIRT_NUM_NODES=3 # master + two nodes
make cluster-up
```
Expand Down Expand Up @@ -66,4 +66,4 @@ make cluster-up
* Create a `cluster/$KUBEVIRT_PROVIDER` directory
* Create a `cluster/$KUBEVIRT_PROVIDER/provider.sh` files
* This file has to contain the functions `up`, `build`, `down` and `_kubectl`
* Have a look at `cluster/k8s-1.10.4/provider.sh` for a reference implementation
* Have a look at `cluster/k8s-1.10.11/provider.sh` for a reference implementation
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dockerizied environment, clone the KubeVirt repository, `cd` into it, and:

```bash
# Build and deploy KubeVirt on Kubernetes 1.10.4 in our vms inside containers
export KUBEVIRT_PROVIDER=k8s-1.10.4 # this is also the default if no KUBEVIRT_PROVIDER is set
export KUBEVIRT_PROVIDER=k8s-1.10.11 # this is also the default if no KUBEVIRT_PROVIDER is set
make cluster-up
make cluster-sync
```
Expand Down
2 changes: 1 addition & 1 deletion hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function build_func_tests_container() {
--label ${bin_name} .
}

KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.10.4}
KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.10.11}
KUBEVIRT_NUM_NODES=${KUBEVIRT_NUM_NODES:-1}
KUBEVIRT_MEMORY_SIZE=${KUBEVIRT_MEMORY_SIZE:-5120M}

Expand Down
2 changes: 1 addition & 1 deletion stdci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
sub-stages:
- k8s-1.10.4:
- k8s-1.10.11:
timeout: 4h
- k8s-1.11.0:
timeout: 4h
Expand Down

0 comments on commit e47b969

Please sign in to comment.