Skip to content

Commit c261df6

Browse files
ImpSyImpSy
authored
update go to 1.19 + k8s.io libs to v0.25.3 (kubeflow#1630)
1 parent 94775cd commit c261df6

File tree

10 files changed

+863
-256
lines changed

10 files changed

+863
-256
lines changed

‎.github/workflows/main.yaml

+16-16
Original file line numberDiff line numberDiff line change
@@ -42,33 +42,33 @@ jobs:
4242
build-sparkctl:
4343
runs-on: ubuntu-latest
4444
steps:
45-
- name: Set up Go
46-
uses: actions/setup-go@v2
47-
with:
48-
go-version: 1.15
49-
5045
- name: Checkout source code
5146
uses: actions/checkout@v2
5247
with:
5348
fetch-depth: "0"
5449

50+
- name: Set up Go
51+
uses: actions/setup-go@v3
52+
with:
53+
go-version-file: "go.mod"
54+
5555
- name: build sparkctl
5656
run: |
5757
make all
5858
5959
build-spark-operator:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- name: Set up Go
63-
uses: actions/setup-go@v2
64-
with:
65-
go-version: 1.15
66-
6762
- name: Checkout source code
6863
uses: actions/checkout@v2
6964
with:
7065
fetch-depth: "0"
7166

67+
- name: Set up Go
68+
uses: actions/setup-go@v3
69+
with:
70+
go-version-file: "go.mod"
71+
7272
- name: Run gofmt check
7373
run: make fmt-check
7474

@@ -155,16 +155,16 @@ jobs:
155155
integration-test:
156156
runs-on: ubuntu-latest
157157
steps:
158-
- name: Set up Go
159-
uses: actions/setup-go@v2
160-
with:
161-
go-version: 1.15
162-
163158
- name: Checkout source code
164159
uses: actions/checkout@v2
165160
with:
166161
fetch-depth: "0"
167162

163+
- name: Set up Go
164+
uses: actions/setup-go@v3
165+
with:
166+
go-version-file: "go.mod"
167+
168168
- name: setup minikube
169169
uses: manusa/actions-setup-minikube@v2.4.2
170170
with:
@@ -181,7 +181,7 @@ jobs:
181181
# The integration tests are currently broken see: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/issues/1416
182182
# - name: Run chart-testing (integration test)
183183
# run: make integation-test
184-
184+
185185
- name: Setup tmate session
186186
if: failure()
187187
uses: mxschmitt/action-tmate@v3

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
ARG SPARK_IMAGE=gcr.io/spark-operator/spark:v3.1.1
1818

19-
FROM golang:1.15.2-alpine as builder
19+
FROM golang:1.19.2-alpine as builder
2020

2121
WORKDIR /workspace
2222

‎charts/spark-operator-chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: spark-operator
33
description: A Helm chart for Spark on Kubernetes operator
4-
version: 1.1.25
5-
appVersion: v1beta2-1.3.7-3.1.1
4+
version: 1.1.26
5+
appVersion: v1beta2-1.3.8-3.1.1
66
keywords:
77
- spark
88
home: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator

‎go.mod

+121-47
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,136 @@
11
module github.com/GoogleCloudPlatform/spark-on-k8s-operator
22

3-
go 1.15
3+
go 1.19
44

55
require (
6-
cloud.google.com/go/storage v1.0.0
7-
github.com/aws/aws-sdk-go v1.29.11
8-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
9-
github.com/elazarl/goproxy v0.0.0-20200421181703-e76ad31c14f6 // indirect
10-
github.com/evanphx/json-patch v4.9.0+incompatible
6+
cloud.google.com/go/storage v1.10.0
7+
github.com/aws/aws-sdk-go v1.38.49
8+
github.com/evanphx/json-patch v4.12.0+incompatible
119
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
1210
github.com/google/go-cloud v0.1.1
13-
github.com/google/uuid v1.1.1
14-
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
15-
github.com/imdario/mergo v0.3.7 // indirect
16-
github.com/mattn/go-runewidth v0.0.4 // indirect
17-
github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c
11+
github.com/google/uuid v1.1.2
12+
github.com/olekukonko/tablewriter v0.0.4
1813
github.com/pkg/errors v0.9.1
19-
github.com/prometheus/client_golang v1.7.1
14+
github.com/prometheus/client_golang v1.12.1
2015
github.com/prometheus/client_model v0.2.0
2116
github.com/robfig/cron v1.2.0
22-
github.com/spf13/cobra v1.0.0
23-
github.com/stretchr/testify v1.4.0
24-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
25-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
26-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
27-
k8s.io/api v0.19.6
28-
k8s.io/apiextensions-apiserver v0.19.6
29-
k8s.io/apimachinery v0.19.6
30-
k8s.io/client-go v0.19.6
31-
k8s.io/kubectl v0.19.6
32-
k8s.io/kubernetes v1.19.6
17+
github.com/spf13/cobra v1.4.0
18+
github.com/stretchr/testify v1.8.0
19+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
20+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
21+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
22+
k8s.io/api v0.25.3
23+
k8s.io/apiextensions-apiserver v0.25.3
24+
k8s.io/apimachinery v0.25.3
25+
k8s.io/client-go v0.25.3
26+
k8s.io/kubectl v0.25.3
27+
k8s.io/kubernetes v1.25.3
28+
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85
3329
volcano.sh/volcano v1.1.0
3430
)
3531

32+
require (
33+
cloud.google.com/go v0.97.0 // indirect
34+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
35+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
36+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
37+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
38+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
39+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
40+
github.com/PuerkitoBio/purell v1.1.1 // indirect
41+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
42+
github.com/beorn7/perks v1.0.1 // indirect
43+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
44+
github.com/davecgh/go-spew v1.1.1 // indirect
45+
github.com/elazarl/goproxy v0.0.0-20200421181703-e76ad31c14f6 // indirect
46+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
47+
github.com/fatih/camelcase v1.0.0 // indirect
48+
github.com/go-errors/errors v1.0.1 // indirect
49+
github.com/go-logr/logr v1.2.3 // indirect
50+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
51+
github.com/go-openapi/jsonreference v0.19.5 // indirect
52+
github.com/go-openapi/swag v0.19.14 // indirect
53+
github.com/gogo/protobuf v1.3.2 // indirect
54+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
55+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
56+
github.com/golang/protobuf v1.5.2 // indirect
57+
github.com/google/btree v1.0.1 // indirect
58+
github.com/google/gnostic v0.5.7-v3refs // indirect
59+
github.com/google/go-cmp v0.5.8 // indirect
60+
github.com/google/gofuzz v1.1.0 // indirect
61+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
62+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
63+
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
64+
github.com/imdario/mergo v0.3.7 // indirect
65+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
66+
github.com/jmespath/go-jmespath v0.4.0 // indirect
67+
github.com/josharian/intern v1.0.0 // indirect
68+
github.com/json-iterator/go v1.1.12 // indirect
69+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
70+
github.com/mailru/easyjson v0.7.6 // indirect
71+
github.com/mattn/go-runewidth v0.0.7 // indirect
72+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
73+
github.com/moby/spdystream v0.2.0 // indirect
74+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
75+
github.com/modern-go/reflect2 v1.0.2 // indirect
76+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
77+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
78+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
79+
github.com/pmezard/go-difflib v1.0.0 // indirect
80+
github.com/prometheus/common v0.32.1 // indirect
81+
github.com/prometheus/procfs v0.7.3 // indirect
82+
github.com/spf13/pflag v1.0.5 // indirect
83+
github.com/xlab/treeprint v1.1.0 // indirect
84+
go.opencensus.io v0.23.0 // indirect
85+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
86+
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
87+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
88+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
89+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
90+
golang.org/x/text v0.3.7 // indirect
91+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
92+
google.golang.org/api v0.60.0 // indirect
93+
google.golang.org/appengine v1.6.7 // indirect
94+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
95+
google.golang.org/grpc v1.47.0 // indirect
96+
google.golang.org/protobuf v1.28.0 // indirect
97+
gopkg.in/inf.v0 v0.9.1 // indirect
98+
gopkg.in/yaml.v2 v2.4.0 // indirect
99+
gopkg.in/yaml.v3 v3.0.1 // indirect
100+
k8s.io/cli-runtime v0.25.3 // indirect
101+
k8s.io/klog/v2 v2.80.1 // indirect
102+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
103+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
104+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
105+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
106+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
107+
sigs.k8s.io/yaml v1.2.0 // indirect
108+
)
109+
36110
replace (
37-
k8s.io/api => k8s.io/api v0.19.6
38-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.6
39-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.6
40-
k8s.io/apiserver => k8s.io/apiserver v0.19.6
41-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.6
42-
k8s.io/client-go => k8s.io/client-go v0.19.6
43-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.6
44-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.6
45-
k8s.io/code-generator => k8s.io/code-generator v0.19.6
46-
k8s.io/component-base => k8s.io/component-base v0.19.6
47-
k8s.io/cri-api => k8s.io/cri-api v0.19.6
48-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.6
49-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.6
50-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.6
51-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.6
52-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.6
53-
k8s.io/kubectl => k8s.io/kubectl v0.19.6
54-
k8s.io/kubelet => k8s.io/kubelet v0.19.6
111+
k8s.io/api => k8s.io/api v0.25.3
112+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
113+
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3
114+
k8s.io/apiserver => k8s.io/apiserver v0.25.3
115+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3
116+
k8s.io/client-go => k8s.io/client-go v0.25.3
117+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3
118+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3
119+
k8s.io/code-generator => k8s.io/code-generator v0.25.3
120+
k8s.io/component-base => k8s.io/component-base v0.25.3
121+
k8s.io/cri-api => k8s.io/cri-api v0.25.3
122+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3
123+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3
124+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3
125+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3
126+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3
127+
k8s.io/kubectl => k8s.io/kubectl v0.25.3
128+
k8s.io/kubelet => k8s.io/kubelet v0.25.3
55129
k8s.io/kubernetes => k8s.io/kubernetes v1.19.6
56-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.6
57-
k8s.io/metrics => k8s.io/metrics v0.19.6
58-
k8s.io/node-api => k8s.io/node-api v0.19.6
59-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.6
60-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.6
61-
k8s.io/sample-controller => k8s.io/sample-controller v0.19.6
130+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3
131+
k8s.io/metrics => k8s.io/metrics v0.25.3
132+
k8s.io/node-api => k8s.io/node-api v0.25.3
133+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3
134+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.3
135+
k8s.io/sample-controller => k8s.io/sample-controller v0.25.3
62136
)

0 commit comments

Comments
 (0)