Upgrade go modules dependencies

Signed-off-by: Adi Muraru <[email protected]>
pravega · Dec 5, 2021 · d5004e2 · d5004e2
1 parent 3ab85e1
commit d5004e2
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 137 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ SHELL=/bin/bash -o pipefail
 PROJECT_NAME=zookeeper-operator
 EXPORTER_NAME=zookeeper-exporter
 APP_NAME=zookeeper
-KUBE_VERSION=1.19.13
+KUBE_VERSION=1.20.13
 REPO=pravega/$(PROJECT_NAME)
 TEST_REPO=testzkop/$(PROJECT_NAME)
 APP_REPO=pravega/$(APP_NAME)

diff --git a/charts/zookeeper-operator/templates/_crd_openapiv3schema.tpl b/charts/zookeeper-operator/templates/_crd_openapiv3schema.tpl
@@ -992,8 +992,7 @@ openAPIV3Schema:
                         can be used to provide different probe parameters at the beginning
                         of a Pod''s lifecycle, when it might take a long time to load
                         data or warm a cache, than during steady-state operation.
-                        This cannot be updated. This is a beta feature enabled by
-                        the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                        This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                       properties:
                         exec:
                           description: One and only one of the following should be
@@ -2142,8 +2141,7 @@ openAPIV3Schema:
                         can be used to provide different probe parameters at the beginning
                         of a Pod''s lifecycle, when it might take a long time to load
                         data or warm a cache, than during steady-state operation.
-                        This cannot be updated. This is a beta feature enabled by
-                        the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                        This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                       properties:
                         exec:
                           description: One and only one of the following should be
@@ -2410,18 +2408,14 @@ openAPIV3Schema:
                         type: array
                       dataSource:
                         description: 'This field can be used to specify either: *
-                          An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
-                          - Beta) * An existing PVC (PersistentVolumeClaim) * An existing
-                          custom resource/object that implements data population (Alpha)
-                          In order to use VolumeSnapshot object types, the appropriate
-                          feature gate must be enabled (VolumeSnapshotDataSource or
-                          AnyVolumeDataSource) If the provisioner or an external controller
-                          can support the specified data source, it will create a
-                          new volume based on the contents of the specified data source.
-                          If the specified data source is not supported, the volume
-                          will not be created and the failure will be reported as
-                          an event. In the future, we plan to support more data source
-                          types and the behavior of the provisioner may change.'
+                          An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                          * An existing PVC (PersistentVolumeClaim) * An existing
+                          custom resource that implements data population (Alpha)
+                          In order to use custom resource types that implement data
+                          population, the AnyVolumeDataSource feature gate must be
+                          enabled. If the provisioner or an external controller can
+                          support the specified data source, it will create a new
+                          volume based on the contents of the specified data source.'
                         properties:
                           apiGroup:
                             description: APIGroup is the group for the resource being
@@ -3339,7 +3333,7 @@ openAPIV3Schema:
                           support fsGroup based ownership(and permissions). It will
                           have no effect on ephemeral volume types such as: secret,
                           configmaps and emptydir. Valid values are "OnRootMismatch"
-                          and "Always". If not specified defaults to "Always".'
+                          and "Always". If not specified, "Always" is used.'
                         type: string
                       runAsGroup:
                         description: The GID to run the entrypoint of the container
@@ -4104,20 +4098,15 @@ openAPIV3Schema:
                                   type: array
                                 dataSource:
                                   description: 'This field can be used to specify
-                                    either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
-                                    - Beta) * An existing PVC (PersistentVolumeClaim)
-                                    * An existing custom resource/object that implements
-                                    data population (Alpha) In order to use VolumeSnapshot
-                                    object types, the appropriate feature gate must
-                                    be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
-                                    If the provisioner or an external controller can
-                                    support the specified data source, it will create
-                                    a new volume based on the contents of the specified
-                                    data source. If the specified data source is not
-                                    supported, the volume will not be created and
-                                    the failure will be reported as an event. In the
-                                    future, we plan to support more data source types
-                                    and the behavior of the provisioner may change.'
+                                    either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim) * An
+                                    existing custom resource that implements data
+                                    population (Alpha) In order to use custom resource
+                                    types that implement data population, the AnyVolumeDataSource
+                                    feature gate must be enabled. If the provisioner
+                                    or an external controller can support the specified
+                                    data source, it will create a new volume based
+                                    on the contents of the specified data source.'
                                   properties:
                                     apiGroup:
                                       description: APIGroup is the group for the resource
@@ -4820,8 +4809,6 @@ openAPIV3Schema:
                                 type: object
                             type: object
                           type: array
-                      required:
-                      - sources
                       type: object
                     quobyte:
                       description: Quobyte represents a Quobyte mount on the host

diff --git a/deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml b/deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml
@@ -1036,8 +1036,7 @@ spec:
                         can be used to provide different probe parameters at the beginning
                         of a Pod''s lifecycle, when it might take a long time to load
                         data or warm a cache, than during steady-state operation.
-                        This cannot be updated. This is a beta feature enabled by
-                        the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                        This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                       properties:
                         exec:
                           description: One and only one of the following should be
@@ -2185,8 +2184,7 @@ spec:
                         can be used to provide different probe parameters at the beginning
                         of a Pod''s lifecycle, when it might take a long time to load
                         data or warm a cache, than during steady-state operation.
-                        This cannot be updated. This is a beta feature enabled by
-                        the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                        This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                       properties:
                         exec:
                           description: One and only one of the following should be
@@ -2453,18 +2451,14 @@ spec:
                         type: array
                       dataSource:
                         description: 'This field can be used to specify either: *
-                          An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
-                          - Beta) * An existing PVC (PersistentVolumeClaim) * An existing
-                          custom resource/object that implements data population (Alpha)
-                          In order to use VolumeSnapshot object types, the appropriate
-                          feature gate must be enabled (VolumeSnapshotDataSource or
-                          AnyVolumeDataSource) If the provisioner or an external controller
-                          can support the specified data source, it will create a
-                          new volume based on the contents of the specified data source.
-                          If the specified data source is not supported, the volume
-                          will not be created and the failure will be reported as
-                          an event. In the future, we plan to support more data source
-                          types and the behavior of the provisioner may change.'
+                          An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                          * An existing PVC (PersistentVolumeClaim) * An existing
+                          custom resource that implements data population (Alpha)
+                          In order to use custom resource types that implement data
+                          population, the AnyVolumeDataSource feature gate must be
+                          enabled. If the provisioner or an external controller can
+                          support the specified data source, it will create a new
+                          volume based on the contents of the specified data source.'
                         properties:
                           apiGroup:
                             description: APIGroup is the group for the resource being
@@ -3382,7 +3376,7 @@ spec:
                           support fsGroup based ownership(and permissions). It will
                           have no effect on ephemeral volume types such as: secret,
                           configmaps and emptydir. Valid values are "OnRootMismatch"
-                          and "Always". If not specified defaults to "Always".'
+                          and "Always". If not specified, "Always" is used.'
                         type: string
                       runAsGroup:
                         description: The GID to run the entrypoint of the container
@@ -4148,20 +4142,15 @@ spec:
                                   type: array
                                 dataSource:
                                   description: 'This field can be used to specify
-                                    either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
-                                    - Beta) * An existing PVC (PersistentVolumeClaim)
-                                    * An existing custom resource/object that implements
-                                    data population (Alpha) In order to use VolumeSnapshot
-                                    object types, the appropriate feature gate must
-                                    be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
-                                    If the provisioner or an external controller can
-                                    support the specified data source, it will create
-                                    a new volume based on the contents of the specified
-                                    data source. If the specified data source is not
-                                    supported, the volume will not be created and
-                                    the failure will be reported as an event. In the
-                                    future, we plan to support more data source types
-                                    and the behavior of the provisioner may change.'
+                                    either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim) * An
+                                    existing custom resource that implements data
+                                    population (Alpha) In order to use custom resource
+                                    types that implement data population, the AnyVolumeDataSource
+                                    feature gate must be enabled. If the provisioner
+                                    or an external controller can support the specified
+                                    data source, it will create a new volume based
+                                    on the contents of the specified data source.'
                                   properties:
                                     apiGroup:
                                       description: APIGroup is the group for the resource
@@ -4864,8 +4853,6 @@ spec:
                                 type: object
                             type: object
                           type: array
-                      required:
-                      - sources
                       type: object
                     quobyte:
                       description: Quobyte represents a Quobyte mount on the host

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	k8s.io/api v0.22.2
 	k8s.io/apimachinery v0.22.2
 	k8s.io/client-go v12.0.0+incompatible
-	sigs.k8s.io/controller-runtime v0.10.2
+	sigs.k8s.io/controller-runtime v0.6.5
 )
 
 require (
@@ -93,8 +93,8 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 	k8s.io/apiextensions-apiserver v0.22.2 // indirect
-	k8s.io/klog/v2 v2.2.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210929172449-94abcedd1aa4 // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 // indirect
 	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
 	sigs.k8s.io/kubebuilder v1.0.9-0.20200618125005-36aa113dbe99 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
@@ -104,52 +104,56 @@ require (
 replace (
 	github.com/go-logr/zapr => github.com/go-logr/zapr v0.4.0
 
-	k8s.io/api => k8s.io/api v0.19.13
+	k8s.io/api => k8s.io/api v0.20.13
 
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.13
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.13
 
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.14-rc.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.14-rc.0
 
-	k8s.io/apiserver => k8s.io/apiserver v0.19.13
+	k8s.io/apiserver => k8s.io/apiserver v0.20.13
 
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.13
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.13
 
-	k8s.io/client-go => k8s.io/client-go v0.19.13
+	k8s.io/client-go => k8s.io/client-go v0.20.13
 
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.13
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.13
 
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.13
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.13
 
-	k8s.io/code-generator => k8s.io/code-generator v0.19.14-rc.0
+	k8s.io/code-generator => k8s.io/code-generator v0.20.14-rc.0
 
-	k8s.io/component-base => k8s.io/component-base v0.19.13
+	k8s.io/component-base => k8s.io/component-base v0.20.13
 
-	k8s.io/controller-manager => k8s.io/controller-manager v0.19.14-rc.0
+	k8s.io/component-helpers => k8s.io/component-helpers v0.20.13
 
-	k8s.io/cri-api => k8s.io/cri-api v0.19.14-rc.0
+	k8s.io/controller-manager => k8s.io/controller-manager v0.20.13
 
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.13
+	k8s.io/cri-api => k8s.io/cri-api v0.20.14-rc.0
 
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.13
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.13
 
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.13
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.13
 
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.13
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.13
 
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.13
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.13
 
-	k8s.io/kubectl => k8s.io/kubectl v0.19.13
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.13
 
-	k8s.io/kubelet => k8s.io/kubelet v0.19.13
+	k8s.io/kubectl => k8s.io/kubectl v0.20.13
 
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.13
+	k8s.io/kubelet => k8s.io/kubelet v0.20.13
 
-	k8s.io/metrics => k8s.io/metrics v0.19.13
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.13
 
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.13
+	k8s.io/metrics => k8s.io/metrics v0.20.13
 
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.13
+	k8s.io/mount-utils => k8s.io/mount-utils v0.20.14-rc.0
 
-	k8s.io/sample-controller => k8s.io/sample-controller v0.19.13
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.13
+
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.13
+
+	k8s.io/sample-controller => k8s.io/sample-controller v0.20.13
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.5
 )