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

Commit cf76839

Browse files
pohlypohly
authored
Merge pull request #932 from pohly/kubernetes-1.21
build: update to Kubernetes 1.21.1
2 parents 7f9ce0f + 7d31acf commit cf76839

File tree

13 files changed

+332
-389
lines changed

13 files changed

+332
-389
lines changed

‎deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6868
x-kubernetes-int-or-string: true
6969
description: 'Limits describes the maximum amount of compute resources
70-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
70+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
7171
type: object
7272
requests:
7373
additionalProperties:
@@ -79,7 +79,7 @@ spec:
7979
description: 'Requests describes the minimum amount of compute
8080
resources required. If Requests is omitted for a container,
8181
it defaults to Limits if that is explicitly specified, otherwise
82-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
82+
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
8383
type: object
8484
type: object
8585
controllerTLSSecret:
@@ -139,7 +139,7 @@ spec:
139139
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
140140
x-kubernetes-int-or-string: true
141141
description: 'Limits describes the maximum amount of compute resources
142-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
142+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
143143
type: object
144144
requests:
145145
additionalProperties:
@@ -151,7 +151,7 @@ spec:
151151
description: 'Requests describes the minimum amount of compute
152152
resources required. If Requests is omitted for a container,
153153
it defaults to Limits if that is explicitly specified, otherwise
154-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
154+
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
155155
type: object
156156
type: object
157157
nodeRegistrarImage:
@@ -170,7 +170,7 @@ spec:
170170
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
171171
x-kubernetes-int-or-string: true
172172
description: 'Limits describes the maximum amount of compute resources
173-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
173+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
174174
type: object
175175
requests:
176176
additionalProperties:
@@ -182,7 +182,7 @@ spec:
182182
description: 'Requests describes the minimum amount of compute
183183
resources required. If Requests is omitted for a container,
184184
it defaults to Limits if that is explicitly specified, otherwise
185-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
185+
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
186186
type: object
187187
type: object
188188
nodeSelector:
@@ -214,7 +214,7 @@ spec:
214214
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
215215
x-kubernetes-int-or-string: true
216216
description: 'Limits describes the maximum amount of compute resources
217-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
217+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
218218
type: object
219219
requests:
220220
additionalProperties:
@@ -226,7 +226,7 @@ spec:
226226
description: 'Requests describes the minimum amount of compute
227227
resources required. If Requests is omitted for a container,
228228
it defaults to Limits if that is explicitly specified, otherwise
229-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
229+
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
230230
type: object
231231
type: object
232232
schedulerNodePort:

‎go.mod‎

Lines changed: 42 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,67 @@ go 1.13
55
require (
66
github.com/aws/aws-sdk-go v1.35.37 // indirect
77
github.com/container-storage-interface/spec v1.3.0
8-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
98
github.com/go-bindata/go-bindata v3.1.2+incompatible
109
github.com/go-logr/logr v0.4.0
11-
github.com/gogo/protobuf v1.3.2 // indirect
12-
github.com/google/go-cmp v0.5.4
10+
github.com/google/go-cmp v0.5.5
1311
github.com/google/gofuzz v1.2.0 // indirect
1412
github.com/google/uuid v1.2.0
15-
github.com/googleapis/gnostic v0.5.4 // indirect
16-
github.com/imdario/mergo v0.3.11 // indirect
1713
github.com/kubernetes-csi/csi-lib-utils v0.9.1
1814
github.com/kubernetes-csi/csi-test/v4 v4.2.0
1915
github.com/miekg/dns v1.1.38 // indirect
20-
github.com/nxadm/tail v1.4.8 // indirect
21-
github.com/onsi/ginkgo v1.14.2
22-
github.com/onsi/gomega v1.10.5
16+
github.com/onsi/ginkgo v1.16.4
17+
github.com/onsi/gomega v1.13.0
2318
github.com/operator-framework/operator-lib v0.4.0
24-
github.com/prometheus/client_golang v1.9.0
19+
github.com/prometheus/client_golang v1.11.0
2520
github.com/prometheus/client_model v0.2.0
26-
github.com/prometheus/common v0.15.0
27-
github.com/prometheus/procfs v0.5.0 // indirect
28-
github.com/stretchr/testify v1.6.1
29-
go.uber.org/multierr v1.6.0 // indirect
30-
go.uber.org/zap v1.16.0 // indirect
31-
golang.org/x/net v0.0.0-20210119194325-5f4716e94777
32-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
33-
golang.org/x/text v0.3.5 // indirect
34-
google.golang.org/appengine v1.6.7 // indirect
21+
github.com/prometheus/common v0.26.0
22+
github.com/stretchr/testify v1.7.0
23+
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
24+
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
3525
google.golang.org/genproto v0.0.0-20210207032614-bba0dbe2a9ea // indirect
3626
google.golang.org/grpc v1.35.0
3727
gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124
3828
gopkg.in/yaml.v2 v2.4.0
39-
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
40-
k8s.io/api v0.20.2
41-
k8s.io/apiextensions-apiserver v0.20.1
42-
k8s.io/apimachinery v0.20.2
29+
k8s.io/api v0.21.1
30+
k8s.io/apiextensions-apiserver v0.21.1
31+
k8s.io/apimachinery v0.21.1
4332
k8s.io/client-go v12.0.0+incompatible
44-
k8s.io/component-base v0.20.2
45-
k8s.io/klog/v2 v2.5.0
46-
k8s.io/kube-scheduler v0.20.2
47-
k8s.io/kubectl v0.20.2
48-
k8s.io/kubernetes v1.20.2
49-
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
50-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
51-
sigs.k8s.io/controller-runtime v0.8.1
33+
k8s.io/component-base v0.21.1
34+
k8s.io/klog/v2 v2.8.0
35+
k8s.io/kube-scheduler v0.21.1
36+
k8s.io/kubectl v0.21.1
37+
k8s.io/kubernetes v1.21.1
38+
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
39+
sigs.k8s.io/controller-runtime v0.9.0
5240
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.2.0
5341
sigs.k8s.io/yaml v1.2.0
5442
)
5543

5644
replace (
57-
k8s.io/api => k8s.io/api v0.20.2
58-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
59-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0-alpha.0
60-
k8s.io/apiserver => k8s.io/apiserver v0.20.2
61-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
62-
k8s.io/client-go => k8s.io/client-go v0.20.2
63-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
64-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
65-
k8s.io/code-generator => k8s.io/code-generator v0.20.3-rc.0
66-
k8s.io/component-base => k8s.io/component-base v0.20.2
67-
k8s.io/controller-manager => k8s.io/controller-manager v0.20.2
68-
k8s.io/cri-api => k8s.io/cri-api v0.20.3-rc.0
69-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
70-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
71-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
72-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
73-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
74-
k8s.io/kubectl => k8s.io/kubectl v0.20.2
75-
k8s.io/kubelet => k8s.io/kubelet v0.20.2
76-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
77-
k8s.io/metrics => k8s.io/metrics v0.20.2
78-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
79-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
80-
k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
45+
k8s.io/api => k8s.io/api v0.21.1
46+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
47+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.1
48+
k8s.io/apiserver => k8s.io/apiserver v0.21.1
49+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.1
50+
k8s.io/client-go => k8s.io/client-go v0.21.1
51+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.1
52+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.1
53+
k8s.io/code-generator => k8s.io/code-generator v0.21.1
54+
k8s.io/component-base => k8s.io/component-base v0.21.1
55+
k8s.io/controller-manager => k8s.io/controller-manager v0.21.1
56+
k8s.io/cri-api => k8s.io/cri-api v0.21.1
57+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.1
58+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.1
59+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.1
60+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.1
61+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.1
62+
k8s.io/kubectl => k8s.io/kubectl v0.21.1
63+
k8s.io/kubelet => k8s.io/kubelet v0.21.1
64+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.1
65+
k8s.io/metrics => k8s.io/metrics v0.21.1
66+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.1
8167
)
8268

83-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.20.2
69+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.21.1
8470

85-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.20.2
71+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.1

0 commit comments

Comments
 (0)