Skip to content

Commit

Permalink
Revert "Bump k8s.io/client-go from 0.31.3 to 0.32.0 (#384)"
Browse files Browse the repository at this point in the history 
This reverts commit 8fae9f5.
  • Loading branch information
@camilamacedo86
camilamacedo86 committed Jan 10, 2025
1 parent 9f35065 commit 6da8b20
Show file tree
Hide file tree
Showing 6 changed files with 172 additions and 330 deletions.
289 changes: 79 additions & 210 deletions crds/operators.coreos.com_clusterserviceversions.yaml
View file

Large diffs are not rendered by default.

58 changes: 12 additions & 46 deletions crds/operators.coreos.com_subscriptions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,8 +1358,6 @@ spec:
description: |-
awsElasticBlockStore represents an AWS Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
type: object
required:
Expand Down Expand Up @@ -1391,10 +1389,7 @@ spec:
More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
type: string
azureDisk:
description: |-
azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
are redirected to the disk.csi.azure.com CSI driver.
description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
type: object
required:
- diskName
Expand Down Expand Up @@ -1426,10 +1421,7 @@ spec:
type: boolean
default: false
azureFile:
description: |-
azureFile represents an Azure File Service mount on the host and bind mount to the pod.
Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
are redirected to the file.csi.azure.com CSI driver.
description: azureFile represents an Azure File Service mount on the host and bind mount to the pod.
type: object
required:
- secretName
Expand All @@ -1447,9 +1439,7 @@ spec:
description: shareName is the azure share Name
type: string
cephfs:
description: |-
cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime
type: object
required:
- monitors
Expand Down Expand Up @@ -1500,8 +1490,6 @@ spec:
cinder:
description: |-
cinder represents a cinder volume attached and mounted on kubelets host machine.
Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
are redirected to the cinder.csi.openstack.org CSI driver.
More info: https://examples.k8s.io/mysql-cinder-pd/README.md
type: object
required:
Expand Down Expand Up @@ -1608,7 +1596,7 @@ spec:
type: boolean
x-kubernetes-map-type: atomic
csi:
description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers.
description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature).
type: object
required:
- driver
Expand Down Expand Up @@ -2050,7 +2038,6 @@ spec:
description: |-
flexVolume represents a generic volume resource that is
provisioned/attached using an exec based plugin.
Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
type: object
required:
- driver
Expand Down Expand Up @@ -2094,9 +2081,7 @@ spec:
default: ""
x-kubernetes-map-type: atomic
flocker:
description: |-
flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
description: flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running
type: object
properties:
datasetName:
Expand All @@ -2111,8 +2096,6 @@ spec:
description: |-
gcePersistentDisk represents a GCE Disk resource that is attached to a
kubelet's host machine and then exposed to the pod.
Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
type: object
required:
Expand Down Expand Up @@ -2148,7 +2131,7 @@ spec:
gitRepo:
description: |-
gitRepo represents a git repository at a particular revision.
Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an
EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
into the Pod's container.
type: object
Expand All @@ -2171,7 +2154,6 @@ spec:
glusterfs:
description: |-
glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
More info: https://examples.k8s.io/volumes/glusterfs/README.md
type: object
required:
Expand Down Expand Up @@ -2378,9 +2360,7 @@ spec:
Default false.
type: boolean
photonPersistentDisk:
description: |-
photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
description: photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine
type: object
required:
- pdID
Expand All @@ -2395,11 +2375,7 @@ spec:
description: pdID is the ID that identifies Photon Controller persistent disk
type: string
portworxVolume:
description: |-
portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
is on.
description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine
type: object
required:
- volumeID
Expand Down Expand Up @@ -2734,9 +2710,7 @@ spec:
type: string
x-kubernetes-list-type: atomic
quobyte:
description: |-
quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime
type: object
required:
- registry
Expand Down Expand Up @@ -2774,7 +2748,6 @@ spec:
rbd:
description: |-
rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
More info: https://examples.k8s.io/volumes/rbd/README.md
type: object
required:
Expand Down Expand Up @@ -2847,9 +2820,7 @@ spec:
type: string
default: admin
scaleIO:
description: |-
scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
type: object
required:
- gateway
Expand Down Expand Up @@ -2975,9 +2946,7 @@ spec:
More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
type: string
storageos:
description: |-
storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
type: object
properties:
fsType:
Expand Down Expand Up @@ -3022,10 +2991,7 @@ spec:
Namespaces that do not pre-exist within StorageOS will be created.
type: string
vsphereVolume:
description: |-
vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
are redirected to the csi.vsphere.vmware.com CSI driver.
description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine
type: object
required:
- volumePath
Expand Down
8 changes: 8 additions & 0 deletions crds/zz_defs.go
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ require (
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7
k8s.io/api v0.32.0
k8s.io/api v0.31.3
k8s.io/apiextensions-apiserver v0.31.3
k8s.io/apimachinery v0.32.0
k8s.io/client-go v0.32.0
sigs.k8s.io/controller-runtime v0.19.4
k8s.io/apimachinery v0.31.3
k8s.io/client-go v0.31.3
sigs.k8s.io/controller-runtime v0.19.3
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -31,16 +31,18 @@ require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -49,7 +51,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
Expand All @@ -68,28 +69,27 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.29.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.31.3 // indirect
k8s.io/component-base v0.31.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit 6da8b20

Please sign in to comment.