Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit acac353

Browse files
authored
Updating Operators CRDs to the latest released version, upgrading Konvoy version to use Kubernetes 1.18 (#111)
* Updating Operators CRDs to the latest released version, upgrading Konvoy version to use Kubernetes 1.18 * Upgrading Volcano scheduler in tests to 1.0.1 * Updating RBAC for Volcano Scheduler * Updating operators module to the latest master
1 parent d7e9ffb commit acac353

File tree

4 files changed

+214
-289
lines changed

4 files changed

+214
-289
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SCRIPTS_DIR := $(ROOT_DIR)/scripts
77
KUDO_TOOLS_DIR := $(ROOT_DIR)/shared
88
SPARK_OPERATOR_DIR := $(ROOT_DIR)/spark-on-k8s-operator
99

10-
export KONVOY_VERSION ?= v1.5.0
10+
export KONVOY_VERSION ?= v1.6.0-rc.2
1111
export CLUSTER_CONFIG_YAML ?= $(ROOT_DIR)/cluster.template.yaml
1212
export WORKER_NODE_INSTANCE_TYPE ?= m5.2xlarge
1313
export WORKER_NODE_COUNT ?= 5
@@ -171,7 +171,7 @@ clean-docker:
171171
clean-all: clean-docker
172172
clean-all:
173173
rm -f *.pem *.pub *-created aws_credentials
174-
rm -rf state runs .konvoy-* *checksum cluster.*yaml* inventory.yaml admin.conf
174+
rm -rf state runs .konvoy-* *checksum cluster.yaml* inventory.yaml admin.conf
175175

176176
# function for extracting the value of an AWS property passed as an argument
177177
define get_aws_credential

cluster.template.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
user: centos
5353
publicKeyFile: kudo-spark-ssh.pub
5454
privateKeyFile: kudo-spark-ssh.pem
55-
version: v1.5.0
55+
version: v1.6.0-rc.2
5656
---
5757
kind: ClusterConfiguration
5858
apiVersion: konvoy.mesosphere.io/v1beta2
@@ -61,7 +61,7 @@ metadata:
6161
creationTimestamp: "2020-01-28T23:15:38Z"
6262
spec:
6363
kubernetes:
64-
version: 1.17.8
64+
version: 1.18.9
6565
controlPlane:
6666
controlPlaneEndpointOverride: ""
6767
certificate: {}
@@ -80,7 +80,7 @@ spec:
8080
- NodeRestriction
8181
containerNetworking:
8282
calico:
83-
version: v3.13.4
83+
version: v3.16.0
8484
encapsulation: ipip
8585
mtu: 1480
8686
containerRuntime:
@@ -92,7 +92,7 @@ spec:
9292
- name: worker
9393
addons:
9494
- configRepository: https://github.com/mesosphere/kubernetes-base-addons
95-
configVersion: stable-1.17-2.0.2
95+
configVersion: testing-2.5.0-3
9696
addonsList:
9797
- name: awsebscsiprovisioner
9898
enabled: true
@@ -181,4 +181,4 @@ spec:
181181
addonsList:
182182
- name: kommander
183183
enabled: false
184-
version: v1.5.0
184+
version: v1.6.0-rc.2

0 commit comments

Comments
 (0)