go.mod: update k8s.io deps to v0.29.0 (#399)

* build(deps): go.mod: update k8s.io deps to v0.29.0 Signed-off-by: Jan Fajerski <[email protected]> * chore: make generate bundle Signed-off-by: Jan Fajerski <[email protected]> * chore: use corev1.VolumeResourceRequirements for PVCs Signed-off-by: Jan Fajerski <[email protected]> --------- Signed-off-by: Jan Fajerski <[email protected]>
rhobs · Jan 3, 2024 · 6792e78 · 6792e78
1 parent 299b0ff
commit 6792e78
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 118 deletions.
diff --git a/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml b/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
@@ -217,28 +217,6 @@ spec:
                           than capacity recorded in the status field of the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
                         properties:
-                          claims:
-                            description: "Claims lists the names of resources, defined
-                              in spec.resourceClaims, that are used by this container.
-                              \n This is an alpha field and requires enabling the
-                              DynamicResourceAllocation feature gate. \n This field
-                              is immutable. It can only be set for containers."
-                            items:
-                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
-                              properties:
-                                name:
-                                  description: Name must match the name of one entry
-                                    in pod.spec.resourceClaims of the Pod where this
-                                    field is used. It makes that resource available
-                                    inside a container.
-                                  type: string
-                              required:
-                              - name
-                              type: object
-                            type: array
-                            x-kubernetes-list-map-keys:
-                            - name
-                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -314,6 +292,25 @@ spec:
                         description: 'storageClassName is the name of the StorageClass
                           required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
                         type: string
+                      volumeAttributesClassName:
+                        description: 'volumeAttributesClassName may be used to set
+                          the VolumeAttributesClass used by this claim. If specified,
+                          the CSI driver will create or update the volume with the
+                          attributes defined in the corresponding VolumeAttributesClass.
+                          This has a different purpose than storageClassName, it can
+                          be changed after the claim is created. An empty string value
+                          means that no VolumeAttributesClass will be applied to the
+                          claim but it''s not allowed to reset this field to empty
+                          string once it is set. If unspecified and the PersistentVolumeClaim
+                          is unbound, the default VolumeAttributesClass will be set
+                          by the persistentvolume controller if it exists. If the
+                          resource referred to by volumeAttributesClass does not exist,
+                          this PersistentVolumeClaim will be set to a Pending state,
+                          as reflected by the modifyVolumeStatus field, until such
+                          as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass
+                          (Alpha) Using this field requires the VolumeAttributesClass
+                          feature gate to be enabled.'
+                        type: string
                       volumeMode:
                         description: volumeMode defines what type of volume is required
                           by the claim. Value of Filesystem is implied when not included

diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml
@@ -42,7 +42,7 @@ metadata:
     categories: Monitoring
     certified: "false"
     containerImage: observability-operator:0.0.28
-    createdAt: "2023-11-08T15:17:06Z"
+    createdAt: "2024-01-03T19:02:56Z"
     description: A Go based Kubernetes operator to setup and manage highly available
       Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
     operators.operatorframework.io/builder: operator-sdk-v1.31.0

diff --git a/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml b/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
@@ -218,28 +218,6 @@ spec:
                           than capacity recorded in the status field of the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
                         properties:
-                          claims:
-                            description: "Claims lists the names of resources, defined
-                              in spec.resourceClaims, that are used by this container.
-                              \n This is an alpha field and requires enabling the
-                              DynamicResourceAllocation feature gate. \n This field
-                              is immutable. It can only be set for containers."
-                            items:
-                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
-                              properties:
-                                name:
-                                  description: Name must match the name of one entry
-                                    in pod.spec.resourceClaims of the Pod where this
-                                    field is used. It makes that resource available
-                                    inside a container.
-                                  type: string
-                              required:
-                              - name
-                              type: object
-                            type: array
-                            x-kubernetes-list-map-keys:
-                            - name
-                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -315,6 +293,25 @@ spec:
                         description: 'storageClassName is the name of the StorageClass
                           required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
                         type: string
+                      volumeAttributesClassName:
+                        description: 'volumeAttributesClassName may be used to set
+                          the VolumeAttributesClass used by this claim. If specified,
+                          the CSI driver will create or update the volume with the
+                          attributes defined in the corresponding VolumeAttributesClass.
+                          This has a different purpose than storageClassName, it can
+                          be changed after the claim is created. An empty string value
+                          means that no VolumeAttributesClass will be applied to the
+                          claim but it''s not allowed to reset this field to empty
+                          string once it is set. If unspecified and the PersistentVolumeClaim
+                          is unbound, the default VolumeAttributesClass will be set
+                          by the persistentvolume controller if it exists. If the
+                          resource referred to by volumeAttributesClass does not exist,
+                          this PersistentVolumeClaim will be set to a Pending state,
+                          as reflected by the modifyVolumeStatus field, until such
+                          as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass
+                          (Alpha) Using this field requires the VolumeAttributesClass
+                          feature gate to be enabled.'
+                        type: string
                       volumeMode:
                         description: volumeMode defines what type of volume is required
                           by the claim. Value of Filesystem is implied when not included

diff --git a/docs/api.md b/docs/api.md
@@ -377,6 +377,13 @@ Define persistent volume claim for prometheus
           storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>volumeAttributesClassName</b></td>
+        <td>string</td>
+        <td>
+          volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it's not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.<br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>volumeMode</b></td>
         <td>string</td>
@@ -501,15 +508,6 @@ resources represents the minimum resources the volume should have. If RecoverVol
         </tr>
     </thead>
     <tbody><tr>
-        <td><b><a href="#monitoringstackspecprometheusconfigpersistentvolumeclaimresourcesclaimsindex">claims</a></b></td>
-        <td>[]object</td>
-        <td>
-          Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. 
- This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. 
- This field is immutable. It can only be set for containers.<br/>
-        </td>
-        <td>false</td>
-      </tr><tr>
         <td><b>limits</b></td>
         <td>map[string]int or string</td>
         <td>
@@ -527,33 +525,6 @@ resources represents the minimum resources the volume should have. If RecoverVol
 </table>
 
 
-### MonitoringStack.spec.prometheusConfig.persistentVolumeClaim.resources.claims[index]
-<sup><sup>[↩ Parent](#monitoringstackspecprometheusconfigpersistentvolumeclaimresources)</sup></sup>
-
-
-
-ResourceClaim references one entry in PodSpec.ResourceClaims.
-
-<table>
-    <thead>
-        <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Description</th>
-            <th>Required</th>
-        </tr>
-    </thead>
-    <tbody><tr>
-        <td><b>name</b></td>
-        <td>string</td>
-        <td>
-          Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.<br/>
-        </td>
-        <td>true</td>
-      </tr></tbody>
-</table>
-
-
 ### MonitoringStack.spec.prometheusConfig.persistentVolumeClaim.selector
 <sup><sup>[↩ Parent](#monitoringstackspecprometheusconfigpersistentvolumeclaim)</sup></sup>
 

diff --git a/go.mod b/go.mod
@@ -11,10 +11,10 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
 	gotest.tools/v3 v3.5.1
-	k8s.io/api v0.28.4
-	k8s.io/apiextensions-apiserver v0.28.4
-	k8s.io/apimachinery v0.28.4
-	k8s.io/client-go v0.28.4
+	k8s.io/api v0.29.0
+	k8s.io/apiextensions-apiserver v0.29.0
+	k8s.io/apimachinery v0.29.0
+	k8s.io/client-go v0.29.0
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/instrumentation-tools v0.0.0-20220317162319-11cd30ce6737
@@ -34,7 +34,7 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/zapr v1.2.4 // indirect
@@ -63,6 +63,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
@@ -92,10 +93,10 @@ require (
 	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/component-base v0.28.4 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	k8s.io/component-base v0.29.0 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )