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

Commit

Permalink
Updating Operators CRDs to the latest released version, upgrading Kon…
Browse files Browse the repository at this point in the history
…voy 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
  • Loading branch information
akirillov authored Oct 14, 2020
1 parent d7e9ffb commit acac353
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 289 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SCRIPTS_DIR := $(ROOT_DIR)/scripts
KUDO_TOOLS_DIR := $(ROOT_DIR)/shared
SPARK_OPERATOR_DIR := $(ROOT_DIR)/spark-on-k8s-operator

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

# function for extracting the value of an AWS property passed as an argument
define get_aws_credential
Expand Down
10 changes: 5 additions & 5 deletions cluster.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
user: centos
publicKeyFile: kudo-spark-ssh.pub
privateKeyFile: kudo-spark-ssh.pem
version: v1.5.0
version: v1.6.0-rc.2
---
kind: ClusterConfiguration
apiVersion: konvoy.mesosphere.io/v1beta2
Expand All @@ -61,7 +61,7 @@ metadata:
creationTimestamp: "2020-01-28T23:15:38Z"
spec:
kubernetes:
version: 1.17.8
version: 1.18.9
controlPlane:
controlPlaneEndpointOverride: ""
certificate: {}
Expand All @@ -80,7 +80,7 @@ spec:
- NodeRestriction
containerNetworking:
calico:
version: v3.13.4
version: v3.16.0
encapsulation: ipip
mtu: 1480
containerRuntime:
Expand All @@ -92,7 +92,7 @@ spec:
- name: worker
addons:
- configRepository: https://github.com/mesosphere/kubernetes-base-addons
configVersion: stable-1.17-2.0.2
configVersion: testing-2.5.0-3
addonsList:
- name: awsebscsiprovisioner
enabled: true
Expand Down Expand Up @@ -181,4 +181,4 @@ spec:
addonsList:
- name: kommander
enabled: false
version: v1.5.0
version: v1.6.0-rc.2
Loading

0 comments on commit acac353

Please sign in to comment.