Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e387d91
build(deps): go.mod: update k8s.io deps to v0.29.0
jan--f Jan 3, 2024
ae8d40b
chore: make generate bundle
jan--f Jan 3, 2024
461cac2
chore: use corev1.VolumeResourceRequirements for PVCs
jan--f Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 19 additions & 22 deletions deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
43 changes: 7 additions & 36 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>

Expand Down
19 changes: 10 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Loading