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

Commit 63f033e

Browse files
committed
* Updating operator submodule to use RC3 image tags
* Updating Konvoy version to 1.6 GA * Fixing GitHub actions to allow ::set-env
1 parent acac353 commit 63f033e

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ jobs:
2323
id: vars
2424
run: echo ::set-output name=version::${GITHUB_REF#refs/*/v}
2525
- name: Extract KUDO version
26+
env:
27+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
2628
run: echo "::set-env name=KUDO_VERSION::$(grep kudoVersion $SPARK_OPERATOR_DIR/operator.yaml | cut -d' ' -f2 | tr -d '"')"
2729
- name: Download KUDO
2830
run: |
2931
curl -L https://github.com/kudobuilder/kudo/releases/download/v${{env.KUDO_VERSION}}/kudo_${{env.KUDO_VERSION}}_linux_x86_64.tar.gz | tar -xvz
3032
chmod +x kubectl-kudo
3133
- name: Package the operator
34+
env:
35+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
3236
run: |
3337
./kubectl-kudo package create $SPARK_OPERATOR_DIR
3438
echo "::set-env name=OPERATOR_PACKAGE_FILE::$(find spark-*.tgz)"

Makefile

Lines changed: 1 addition & 1 deletion
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.6.0-rc.2
10+
export KONVOY_VERSION ?= v1.6.0
1111
export CLUSTER_CONFIG_YAML ?= $(ROOT_DIR)/cluster.template.yaml
1212
export WORKER_NODE_INSTANCE_TYPE ?= m5.2xlarge
1313
export WORKER_NODE_COUNT ?= 5

cluster.template.yaml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
vpc:
1111
overrideDefaultRouteTable: true
1212
enableInternetGateway: true
13-
enableVPCEndpoints: true
13+
enableVPCEndpoints: false
1414
availabilityZones:
1515
- us-west-2c
1616
elb:
@@ -52,7 +52,7 @@ spec:
5252
user: centos
5353
publicKeyFile: kudo-spark-ssh.pub
5454
privateKeyFile: kudo-spark-ssh.pem
55-
version: v1.6.0-rc.2
55+
version: v1.6.0
5656
---
5757
kind: ClusterConfiguration
5858
apiVersion: konvoy.mesosphere.io/v1beta2
@@ -61,17 +61,12 @@ metadata:
6161
creationTimestamp: "2020-01-28T23:15:38Z"
6262
spec:
6363
kubernetes:
64-
version: 1.18.9
65-
controlPlane:
66-
controlPlaneEndpointOverride: ""
67-
certificate: {}
64+
version: 1.18.10
6865
networking:
6966
podSubnet: 192.168.0.0/16
7067
serviceSubnet: 10.0.0.0/18
7168
iptables:
7269
addDefaultRules: false
73-
httpProxy: ""
74-
httpsProxy: ""
7570
cloudProvider:
7671
provider: aws
7772
admissionPlugins:
@@ -80,20 +75,22 @@ spec:
8075
- NodeRestriction
8176
containerNetworking:
8277
calico:
83-
version: v3.16.0
78+
version: v3.16.4
8479
encapsulation: ipip
8580
mtu: 1480
8681
containerRuntime:
8782
containerd:
88-
version: 1.3.4
83+
version: 1.3.7
8984
osPackages:
9085
enableAdditionalRepositories: true
9186
nodePools:
9287
- name: worker
9388
addons:
9489
- configRepository: https://github.com/mesosphere/kubernetes-base-addons
95-
configVersion: testing-2.5.0-3
90+
configVersion: stable-1.18-3.0.0
9691
addonsList:
92+
- name: ambassador # Ambassador is currently in Preview
93+
enabled: false
9794
- name: awsebscsiprovisioner
9895
enabled: true
9996
- name: awsebsprovisioner
@@ -113,6 +110,8 @@ spec:
113110
enabled: true
114111
- name: elasticsearch
115112
enabled: false
113+
- name: elasticsearch-curator
114+
enabled: false
116115
- name: elasticsearchexporter
117116
enabled: false
118117
- name: flagger
@@ -166,19 +165,14 @@ spec:
166165
secretKeyRef: null
167166
- name: velero
168167
enabled: false
169-
- configRepository: https://github.com/mesosphere/kubeaddons-conductor
170-
configVersion: stable-1.17-1.0.0
171-
addonsList:
172-
- name: conductor
173-
enabled: false
174168
- configRepository: https://github.com/mesosphere/kubeaddons-dispatch
175-
configVersion: stable-1.17-1.2.2
169+
configVersion: stable-1.18-1.3.0
176170
addonsList:
177171
- name: dispatch
178172
enabled: false
179173
- configRepository: https://github.com/mesosphere/kubeaddons-kommander
180-
configVersion: stable-1.17-1.1.0
174+
configVersion: stable-1.18-1.2.0
181175
addonsList:
182176
- name: kommander
183177
enabled: false
184-
version: v1.6.0-rc.2
178+
version: v1.6.0

0 commit comments

Comments
 (0)