Skip to content

Commit a2e4ebb

Browse files
amuraruamuraru
committed
Upgrade go modules dependencies
Signed-off-by: Adi Muraru <[email protected]>
1 parent 7b8e1bc commit a2e4ebb

File tree

5 files changed

+113
-140
lines changed

5 files changed

+113
-140
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SHELL=/bin/bash -o pipefail
1111
PROJECT_NAME=zookeeper-operator
1212
EXPORTER_NAME=zookeeper-exporter
1313
APP_NAME=zookeeper
14-
KUBE_VERSION=1.19.13
14+
KUBE_VERSION=1.20.13
1515
REPO=pravega/$(PROJECT_NAME)
1616
TEST_REPO=testzkop/$(PROJECT_NAME)
1717
APP_REPO=pravega/$(APP_NAME)

‎charts/zookeeper-operator/templates/zookeeper.pravega.io_zookeeperclusters_crd.yaml‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,7 @@ spec:
10361036
can be used to provide different probe parameters at the beginning
10371037
of a Pod''s lifecycle, when it might take a long time to load
10381038
data or warm a cache, than during steady-state operation.
1039-
This cannot be updated. This is a beta feature enabled by
1040-
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
1039+
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
10411040
properties:
10421041
exec:
10431042
description: One and only one of the following should be
@@ -2184,8 +2183,7 @@ spec:
21842183
can be used to provide different probe parameters at the beginning
21852184
of a Pod''s lifecycle, when it might take a long time to load
21862185
data or warm a cache, than during steady-state operation.
2187-
This cannot be updated. This is a beta feature enabled by
2188-
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
2186+
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
21892187
properties:
21902188
exec:
21912189
description: One and only one of the following should be
@@ -2452,18 +2450,14 @@ spec:
24522450
type: array
24532451
dataSource:
24542452
description: 'This field can be used to specify either: *
2455-
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
2456-
- Beta) * An existing PVC (PersistentVolumeClaim) * An existing
2457-
custom resource/object that implements data population (Alpha)
2458-
In order to use VolumeSnapshot object types, the appropriate
2459-
feature gate must be enabled (VolumeSnapshotDataSource or
2460-
AnyVolumeDataSource) If the provisioner or an external controller
2461-
can support the specified data source, it will create a
2462-
new volume based on the contents of the specified data source.
2463-
If the specified data source is not supported, the volume
2464-
will not be created and the failure will be reported as
2465-
an event. In the future, we plan to support more data source
2466-
types and the behavior of the provisioner may change.'
2453+
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
2454+
* An existing PVC (PersistentVolumeClaim) * An existing
2455+
custom resource that implements data population (Alpha)
2456+
In order to use custom resource types that implement data
2457+
population, the AnyVolumeDataSource feature gate must be
2458+
enabled. If the provisioner or an external controller can
2459+
support the specified data source, it will create a new
2460+
volume based on the contents of the specified data source.'
24672461
properties:
24682462
apiGroup:
24692463
description: APIGroup is the group for the resource being
@@ -3381,7 +3375,7 @@ spec:
33813375
support fsGroup based ownership(and permissions). It will
33823376
have no effect on ephemeral volume types such as: secret,
33833377
configmaps and emptydir. Valid values are "OnRootMismatch"
3384-
and "Always". If not specified defaults to "Always".'
3378+
and "Always". If not specified, "Always" is used.'
33853379
type: string
33863380
runAsGroup:
33873381
description: The GID to run the entrypoint of the container
@@ -4146,20 +4140,15 @@ spec:
41464140
type: array
41474141
dataSource:
41484142
description: 'This field can be used to specify
4149-
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
4150-
- Beta) * An existing PVC (PersistentVolumeClaim)
4151-
* An existing custom resource/object that implements
4152-
data population (Alpha) In order to use VolumeSnapshot
4153-
object types, the appropriate feature gate must
4154-
be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
4155-
If the provisioner or an external controller can
4156-
support the specified data source, it will create
4157-
a new volume based on the contents of the specified
4158-
data source. If the specified data source is not
4159-
supported, the volume will not be created and
4160-
the failure will be reported as an event. In the
4161-
future, we plan to support more data source types
4162-
and the behavior of the provisioner may change.'
4143+
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
4144+
* An existing PVC (PersistentVolumeClaim) * An
4145+
existing custom resource that implements data
4146+
population (Alpha) In order to use custom resource
4147+
types that implement data population, the AnyVolumeDataSource
4148+
feature gate must be enabled. If the provisioner
4149+
or an external controller can support the specified
4150+
data source, it will create a new volume based
4151+
on the contents of the specified data source.'
41634152
properties:
41644153
apiGroup:
41654154
description: APIGroup is the group for the resource
@@ -4862,8 +4851,6 @@ spec:
48624851
type: object
48634852
type: object
48644853
type: array
4865-
required:
4866-
- sources
48674854
type: object
48684855
quobyte:
48694856
description: Quobyte represents a Quobyte mount on the host

‎deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,8 +1035,7 @@ spec:
10351035
can be used to provide different probe parameters at the beginning
10361036
of a Pod''s lifecycle, when it might take a long time to load
10371037
data or warm a cache, than during steady-state operation.
1038-
This cannot be updated. This is a beta feature enabled by
1039-
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
1038+
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
10401039
properties:
10411040
exec:
10421041
description: One and only one of the following should be
@@ -2183,8 +2182,7 @@ spec:
21832182
can be used to provide different probe parameters at the beginning
21842183
of a Pod''s lifecycle, when it might take a long time to load
21852184
data or warm a cache, than during steady-state operation.
2186-
This cannot be updated. This is a beta feature enabled by
2187-
the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
2185+
This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
21882186
properties:
21892187
exec:
21902188
description: One and only one of the following should be
@@ -2451,18 +2449,14 @@ spec:
24512449
type: array
24522450
dataSource:
24532451
description: 'This field can be used to specify either: *
2454-
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
2455-
- Beta) * An existing PVC (PersistentVolumeClaim) * An existing
2456-
custom resource/object that implements data population (Alpha)
2457-
In order to use VolumeSnapshot object types, the appropriate
2458-
feature gate must be enabled (VolumeSnapshotDataSource or
2459-
AnyVolumeDataSource) If the provisioner or an external controller
2460-
can support the specified data source, it will create a
2461-
new volume based on the contents of the specified data source.
2462-
If the specified data source is not supported, the volume
2463-
will not be created and the failure will be reported as
2464-
an event. In the future, we plan to support more data source
2465-
types and the behavior of the provisioner may change.'
2452+
An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
2453+
* An existing PVC (PersistentVolumeClaim) * An existing
2454+
custom resource that implements data population (Alpha)
2455+
In order to use custom resource types that implement data
2456+
population, the AnyVolumeDataSource feature gate must be
2457+
enabled. If the provisioner or an external controller can
2458+
support the specified data source, it will create a new
2459+
volume based on the contents of the specified data source.'
24662460
properties:
24672461
apiGroup:
24682462
description: APIGroup is the group for the resource being
@@ -3380,7 +3374,7 @@ spec:
33803374
support fsGroup based ownership(and permissions). It will
33813375
have no effect on ephemeral volume types such as: secret,
33823376
configmaps and emptydir. Valid values are "OnRootMismatch"
3383-
and "Always". If not specified defaults to "Always".'
3377+
and "Always". If not specified, "Always" is used.'
33843378
type: string
33853379
runAsGroup:
33863380
description: The GID to run the entrypoint of the container
@@ -4145,20 +4139,15 @@ spec:
41454139
type: array
41464140
dataSource:
41474141
description: 'This field can be used to specify
4148-
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
4149-
- Beta) * An existing PVC (PersistentVolumeClaim)
4150-
* An existing custom resource/object that implements
4151-
data population (Alpha) In order to use VolumeSnapshot
4152-
object types, the appropriate feature gate must
4153-
be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
4154-
If the provisioner or an external controller can
4155-
support the specified data source, it will create
4156-
a new volume based on the contents of the specified
4157-
data source. If the specified data source is not
4158-
supported, the volume will not be created and
4159-
the failure will be reported as an event. In the
4160-
future, we plan to support more data source types
4161-
and the behavior of the provisioner may change.'
4142+
either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
4143+
* An existing PVC (PersistentVolumeClaim) * An
4144+
existing custom resource that implements data
4145+
population (Alpha) In order to use custom resource
4146+
types that implement data population, the AnyVolumeDataSource
4147+
feature gate must be enabled. If the provisioner
4148+
or an external controller can support the specified
4149+
data source, it will create a new volume based
4150+
on the contents of the specified data source.'
41624151
properties:
41634152
apiGroup:
41644153
description: APIGroup is the group for the resource
@@ -4861,8 +4850,6 @@ spec:
48614850
type: object
48624851
type: object
48634852
type: array
4864-
required:
4865-
- sources
48664853
type: object
48674854
quobyte:
48684855
description: Quobyte represents a Quobyte mount on the host

‎go.mod‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver v3.5.1+incompatible // indirect
3333
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34-
github.com/containerd/containerd v1.4.11 // indirect
34+
github.com/containerd/containerd v1.4.12 // indirect
3535
github.com/containerd/ttrpc v1.0.2 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
3737
github.com/docker/docker v20.10.2+incompatible // indirect
@@ -59,6 +59,7 @@ require (
5959
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6060
github.com/modern-go/reflect2 v1.0.2 // indirect
6161
github.com/nxadm/tail v1.4.8 // indirect
62+
github.com/opencontainers/image-spec v1.0.2 // indirect
6263
github.com/operator-framework/api v0.10.7 // indirect
6364
github.com/operator-framework/operator-registry v1.13.9 // indirect
6465
github.com/pborman/uuid v1.2.1 // indirect
@@ -93,8 +94,8 @@ require (
9394
gopkg.in/yaml.v2 v2.4.0 // indirect
9495
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
9596
k8s.io/apiextensions-apiserver v0.22.2 // indirect
96-
k8s.io/klog/v2 v2.2.0 // indirect
97-
k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect
97+
k8s.io/klog/v2 v2.9.0 // indirect
98+
k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 // indirect
9899
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
99100
sigs.k8s.io/kubebuilder v1.0.9-0.20200618125005-36aa113dbe99 // indirect
100101
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
@@ -104,52 +105,56 @@ require (
104105
replace (
105106
github.com/go-logr/zapr => github.com/go-logr/zapr v0.4.0
106107

107-
k8s.io/api => k8s.io/api v0.19.13
108+
k8s.io/api => k8s.io/api v0.20.13
108109

109-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.13
110+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.13
110111

111-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.14-rc.0
112+
k8s.io/apimachinery => k8s.io/apimachinery v0.20.14-rc.0
112113

113-
k8s.io/apiserver => k8s.io/apiserver v0.19.13
114+
k8s.io/apiserver => k8s.io/apiserver v0.20.13
114115

115-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.13
116+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.13
116117

117-
k8s.io/client-go => k8s.io/client-go v0.19.13
118+
k8s.io/client-go => k8s.io/client-go v0.20.13
118119

119-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.13
120+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.13
120121

121-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.13
122+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.13
122123

123-
k8s.io/code-generator => k8s.io/code-generator v0.19.14-rc.0
124+
k8s.io/code-generator => k8s.io/code-generator v0.20.14-rc.0
124125

125-
k8s.io/component-base => k8s.io/component-base v0.19.13
126+
k8s.io/component-base => k8s.io/component-base v0.20.13
126127

127-
k8s.io/controller-manager => k8s.io/controller-manager v0.19.14-rc.0
128+
k8s.io/component-helpers => k8s.io/component-helpers v0.20.13
128129

129-
k8s.io/cri-api => k8s.io/cri-api v0.19.14-rc.0
130+
k8s.io/controller-manager => k8s.io/controller-manager v0.20.13
130131

131-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.13
132+
k8s.io/cri-api => k8s.io/cri-api v0.20.14-rc.0
132133

133-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.13
134+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.13
134135

135-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.13
136+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.13
136137

137-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.13
138+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.13
138139

139-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.13
140+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.13
140141

141-
k8s.io/kubectl => k8s.io/kubectl v0.19.13
142+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.13
142143

143-
k8s.io/kubelet => k8s.io/kubelet v0.19.13
144+
k8s.io/kubectl => k8s.io/kubectl v0.20.13
144145

145-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.13
146+
k8s.io/kubelet => k8s.io/kubelet v0.20.13
146147

147-
k8s.io/metrics => k8s.io/metrics v0.19.13
148+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.13
148149

149-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.13
150+
k8s.io/metrics => k8s.io/metrics v0.20.13
150151

151-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.13
152+
k8s.io/mount-utils => k8s.io/mount-utils v0.20.14-rc.0
152153

153-
k8s.io/sample-controller => k8s.io/sample-controller v0.19.13
154+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.13
155+
156+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.13
157+
158+
k8s.io/sample-controller => k8s.io/sample-controller v0.20.13
154159
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.5
155160
)

0 commit comments

Comments
 (0)