Skip to content

Commit aaf17de

Browse files
chore(bump): bumps k8s dependencies to 1.23.3 (#181)
This PR also * bumps go version to 1.17.6 * update controller and kube-gen, removed unused file * update changelog and readme Signed-off-by: shubham <shubham.bajpai@mayadata.io>
1 parent 032928b commit aaf17de

File tree

17 files changed

+613
-313
lines changed

17 files changed

+613
-313
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ jobs:
5353
runs-on: ubuntu-latest
5454
steps:
5555

56-
- name: Set up Go 1.14
56+
- name: Set up Go 1.17
5757
uses: actions/setup-go@v2
5858
with:
59-
go-version: 1.16.5
59+
go-version: 1.17.6
6060

6161
- name: Check out code into the Go module directory
6262
uses: actions/checkout@v2
@@ -79,16 +79,16 @@ jobs:
7979
- name: Checkout
8080
uses: actions/checkout@v2
8181

82-
- name: Set up Go 1.14
82+
- name: Set up Go 1.17
8383
uses: actions/setup-go@v2
8484
with:
85-
go-version: 1.16.5
85+
go-version: 1.17.6
8686

8787
- name: Setup Minikube-Kubernetes
88-
uses: manusa/actions-setup-minikube@v2.3.0
88+
uses: manusa/actions-setup-minikube@v2.4.3
8989
with:
90-
minikube version: v1.21.0
91-
kubernetes version: v1.20.7
90+
minikube version: 'v1.24.0'
91+
kubernetes version: 'v1.21.0'
9292
github token: ${{ secrets.GITHUB_TOKEN }}
9393

9494
- name: Set tag

.github/workflows/pull_request.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151

52-
- name: Set up Go 1.14
52+
- name: Set up Go 1.17
5353
uses: actions/setup-go@v2
5454
with:
55-
go-version: 1.16.5
55+
go-version: 1.17.6
5656

5757
- name: Check out code into the Go module directory
5858
uses: actions/checkout@v2
@@ -81,16 +81,16 @@ jobs:
8181
- name: Checkout
8282
uses: actions/checkout@v2
8383

84-
- name: Set up Go 1.14
84+
- name: Set up Go 1.17
8585
uses: actions/setup-go@v2
8686
with:
87-
go-version: 1.16.5
87+
go-version: 1.17.6
8888

8989
- name: Setup Minikube-Kubernetes
90-
uses: manusa/actions-setup-minikube@v2.3.0
90+
uses: manusa/actions-setup-minikube@v2.4.3
9191
with:
92-
minikube version: v1.21.0
93-
kubernetes version: v1.20.7
92+
minikube version: 'v1.24.0'
93+
kubernetes version: 'v1.21.8'
9494
github token: ${{ secrets.GITHUB_TOKEN }}
9595

9696
- name: Set tag

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ We are always happy to list users who run Jiva in production, check out our exis
3535
| ------------| ---------------- | -------------
3636
| 1.18+ | 2.6.0+ | Beta
3737
| 1.20+ | 2.12.0+ | Beta
38+
| 1.21+ | 3.2.0+ | Stable
3839

3940
## Usage
4041

build/jiva-csi/jiva-csi.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.14.7 as build
15+
FROM golang:1.17.6 as build
1616

1717
ARG BRANCH
1818
ARG RELEASE_TAG

build/jiva-operator/jiva-operator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.14.7 as build
15+
FROM golang:1.17.6 as build
1616

1717
ARG BRANCH
1818
ARG RELEASE_TAG
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore(bump): bumps k8s dependencies to 1.23.3

go.mod

Lines changed: 105 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,125 @@
11
module github.com/openebs/jiva-operator
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/container-storage-interface/spec v1.2.0
77
github.com/docker/go-units v0.4.0
8-
github.com/go-openapi/spec v0.19.4
98
github.com/google/uuid v1.1.2
109
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
1110
github.com/kubernetes-csi/csi-lib-iscsi v0.0.0-20191120152119-1430b53a1741
1211
github.com/kubernetes-csi/csi-lib-utils v0.6.1
13-
github.com/onsi/ginkgo v1.14.1
14-
github.com/onsi/gomega v1.10.2
12+
github.com/onsi/ginkgo v1.16.5
13+
github.com/onsi/gomega v1.17.0
1514
github.com/openebs/lib-csi v0.3.0
1615
github.com/pkg/errors v0.9.1
17-
github.com/sirupsen/logrus v1.6.0
18-
github.com/spf13/cobra v1.1.1
19-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
20-
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
21-
google.golang.org/grpc v1.29.0
22-
k8s.io/api v0.20.2
23-
k8s.io/apimachinery v0.20.2
24-
k8s.io/client-go v0.20.2
25-
k8s.io/cloud-provider v0.20.2
26-
k8s.io/code-generator v0.20.2
16+
github.com/sirupsen/logrus v1.8.1
17+
github.com/spf13/cobra v1.2.1
18+
golang.org/x/net v0.0.0-20211209124913-491a49abca63
19+
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8
20+
google.golang.org/grpc v1.40.0
21+
k8s.io/api v0.23.3
22+
k8s.io/apimachinery v0.23.3
23+
k8s.io/client-go v0.23.3
24+
k8s.io/cloud-provider v0.23.3
25+
k8s.io/code-generator v0.23.3
2726
k8s.io/klog v1.0.0
28-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
29-
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
30-
sigs.k8s.io/controller-runtime v0.8.2
27+
k8s.io/utils v0.0.0-20211116205334-6203023598ed
28+
sigs.k8s.io/controller-runtime v0.11.0
29+
)
30+
31+
require (
32+
cloud.google.com/go v0.81.0 // indirect
33+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
34+
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
35+
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
36+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
37+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
38+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
39+
github.com/PuerkitoBio/purell v1.1.1 // indirect
40+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
41+
github.com/beorn7/perks v1.0.1 // indirect
42+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
43+
github.com/davecgh/go-spew v1.1.1 // indirect
44+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
45+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
46+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
47+
github.com/fsnotify/fsnotify v1.5.1 // indirect
48+
github.com/go-logr/logr v1.2.0 // indirect
49+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
50+
github.com/go-openapi/jsonreference v0.19.5 // indirect
51+
github.com/go-openapi/swag v0.19.14 // indirect
52+
github.com/gogo/protobuf v1.3.2 // indirect
53+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
54+
github.com/golang/protobuf v1.5.2 // indirect
55+
github.com/google/go-cmp v0.5.5 // indirect
56+
github.com/google/gofuzz v1.1.0 // indirect
57+
github.com/googleapis/gnostic v0.5.5 // indirect
58+
github.com/imdario/mergo v0.3.12 // indirect
59+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
60+
github.com/josharian/intern v1.0.0 // indirect
61+
github.com/json-iterator/go v1.1.12 // indirect
62+
github.com/mailru/easyjson v0.7.6 // indirect
63+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
64+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
65+
github.com/modern-go/reflect2 v1.0.2 // indirect
66+
github.com/nxadm/tail v1.4.8 // indirect
67+
github.com/prometheus/client_golang v1.11.0 // indirect
68+
github.com/prometheus/client_model v0.2.0 // indirect
69+
github.com/prometheus/common v0.28.0 // indirect
70+
github.com/prometheus/procfs v0.6.0 // indirect
71+
github.com/spf13/pflag v1.0.5 // indirect
72+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
73+
golang.org/x/mod v0.4.2 // indirect
74+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
75+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
76+
golang.org/x/text v0.3.7 // indirect
77+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
78+
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
79+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
80+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
81+
google.golang.org/appengine v1.6.7 // indirect
82+
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
83+
google.golang.org/protobuf v1.27.1 // indirect
84+
gopkg.in/inf.v0 v0.9.1 // indirect
85+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
86+
gopkg.in/yaml.v2 v2.4.0 // indirect
87+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
88+
k8s.io/apiextensions-apiserver v0.23.0 // indirect
89+
k8s.io/component-base v0.23.3 // indirect
90+
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
91+
k8s.io/klog/v2 v2.30.0 // indirect
92+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
93+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
94+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
95+
sigs.k8s.io/yaml v1.3.0 // indirect
3196
)
3297

3398
replace (
3499
github.com/jpillora/go-ogle-analytics => github.com/openebs/go-ogle-analytics v0.1.0
35-
k8s.io/api => k8s.io/api v0.20.2
36-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
37-
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
38-
k8s.io/apiserver => k8s.io/apiserver v0.20.2
39-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
40-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
41-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
42-
k8s.io/code-generator => k8s.io/code-generator v0.20.2
43-
k8s.io/component-base => k8s.io/component-base v0.20.2
44-
k8s.io/cri-api => k8s.io/cri-api v0.20.2
45-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
46-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
47-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
48-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
49-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
50-
k8s.io/kubectl => k8s.io/kubectl v0.20.2
51-
k8s.io/kubelet => k8s.io/kubelet v0.20.2
52-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
53-
k8s.io/metrics => k8s.io/metrics v0.20.2
54-
k8s.io/node-api => k8s.io/node-api v0.20.2
55-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
56-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
57-
k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
100+
k8s.io/api => k8s.io/api v0.23.3
101+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.3
102+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.3
103+
k8s.io/apiserver => k8s.io/apiserver v0.23.3
104+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.3
105+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.3
106+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.3
107+
k8s.io/code-generator => k8s.io/code-generator v0.23.3
108+
k8s.io/component-base => k8s.io/component-base v0.23.3
109+
k8s.io/cri-api => k8s.io/cri-api v0.23.3
110+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.3
111+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.3
112+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.3
113+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.3
114+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.3
115+
k8s.io/kubectl => k8s.io/kubectl v0.23.3
116+
k8s.io/kubelet => k8s.io/kubelet v0.23.3
117+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.3
118+
k8s.io/metrics => k8s.io/metrics v0.23.3
119+
k8s.io/node-api => k8s.io/node-api v0.23.3
120+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.3
121+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.3
122+
k8s.io/sample-controller => k8s.io/sample-controller v0.23.3
58123
)
59124

60125
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

0 commit comments

Comments
 (0)