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.

Sign up for GitHub

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

Jump to bottom

replace k8s 1.12 with 1.15 #223

Merged
merged 7 commits into from
Jun 26, 2019
Merged

replace k8s 1.12 with 1.15 #223

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
9a84886
replace k8s 1.12 with 1.15
Jun 23, 2019
add6f0d
fix the build
Jun 23, 2019
a7f8fd0
update kind version
Jun 26, 2019
319918e
fix the build
Jun 26, 2019
6f9a532
fix the build
Jun 26, 2019
cbbeb9a
fix the build
Jun 26, 2019
ab52687
fix kind config
Jun 26, 2019
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
24 changes: 12 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ jobs:
- store_artifacts:
path: tests/blackbox/compose/reports/
destination: zap-reports

test_crd_1_12:
machine: true
steps:
- test_crd_command:
kubernetesVersion: "v1.12.8"

test_crd_1_13:
machine: true
steps:
- test_crd_command:
kubernetesVersion: "v1.13.6"
kubernetesVersion: "v1.13.7"

test_crd_1_14:
machine: true
steps:
- test_crd_command:
kubernetesVersion: "v1.14.2"
kubernetesVersion: "v1.14.3"

test_crd_1_15:
machine: true
steps:
- test_crd_command:
kubernetesVersion: "v1.15.0"

run_tests:
docker:
Expand Down Expand Up @@ -341,15 +341,15 @@ workflows:
requires:
- build_api
- lint-scripts
- test_crd_1_12:
- test_crd_1_13:
requires:
- build_api
- lint-scripts
- test_crd_1_13:
- test_crd_1_14:
requires:
- build_api
- lint-scripts
- test_crd_1_14:
- test_crd_1_15:
requires:
- build_api
- lint-scripts
Expand All @@ -359,9 +359,9 @@ workflows:
- build_api
- run_tests
- test_blackbox
- test_crd_1_12
- test_crd_1_13
- test_crd_1_14
- test_crd_1_15
filters:
branches:
only: master
Expand Down
15 changes: 13 additions & 2 deletions tests/crd-controller/kind-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
kind: Config
apiVersion: kind.sigs.k8s.io/v1alpha2
apiVersion: kind.sigs.k8s.io/v1alpha3
nodes:
- role: control-plane
- role: worker
replicas: 3
replicas: 3

# this config file contains all config fields with comments
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
nodes:
# the control plane node config
- role: control-plane
# the three workers
- role: worker
- role: worker
- role: worker
2 changes: 1 addition & 1 deletion tests/crd-controller/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit
set -o nounset
set -o pipefail

readonly KIND_VERSION=0.3.0
readonly KIND_VERSION=0.4.0
readonly CLUSTER_NAME=e2e-test
readonly KUBECTL_VERSION=v1.13.0

Expand Down