Skip to content

Commit

Permalink
Revert go 1.23 bump (#533)
Browse files Browse the repository at this point in the history 
* Revert bump that requires go 1.23

We're not there yet

Signed-off-by: Alex Kalenyuk <[email protected]>

* Standardize setting go.mod to minor

See kubevirt/containerized-data-importer#3496

Signed-off-by: Alex Kalenyuk <[email protected]>

* make build

Signed-off-by: Alex Kalenyuk <[email protected]>

---------

Signed-off-by: Alex Kalenyuk <[email protected]>
  • Loading branch information
@akalenyu
akalenyu authored Dec 4, 2024
1 parent 265a0c3 commit dcbd191
Show file tree
Hide file tree
Showing 16 changed files with 129 additions and 808 deletions.
48 changes: 28 additions & 20 deletions deploy/operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.5
name: hostpathprovisioners.hostpathprovisioner.kubevirt.io
spec:
group: hostpathprovisioner.kubevirt.io
Expand Down Expand Up @@ -691,7 +691,7 @@ spec:
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/volume-attributes-classes/
(Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.
(Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
type: string
volumeMode:
description: |-
Expand Down Expand Up @@ -1002,7 +1002,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand All @@ -1017,7 +1017,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand Down Expand Up @@ -1184,7 +1184,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand All @@ -1199,7 +1199,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand Down Expand Up @@ -1364,7 +1364,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand All @@ -1379,7 +1379,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand Down Expand Up @@ -1546,7 +1546,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand All @@ -1561,7 +1561,7 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
items:
type: string
type: array
Expand Down Expand Up @@ -1779,7 +1779,7 @@ spec:
names such as \"example.com/my-custom-resource\"\nApart
from above values - keys that are unprefixed or
have kubernetes.io prefix are considered\nreserved
and hence may not be used.\n\n\nClaimResourceStatus
and hence may not be used.\n\nClaimResourceStatus
can be in any of following states:\n\t- ControllerResizeInProgress:\n\t\tState
set when resize controller starts resizing the volume
in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
Expand All @@ -1800,14 +1800,14 @@ spec:
= \"NodeResizeInProgress\"\n - pvc.status.allocatedResourceStatus['storage']
= \"NodeResizeFailed\"\nWhen this field is not set,
it means that no resize operation is in progress
for the given PVC.\n\n\nA controller that receives
for the given PVC.\n\nA controller that receives
PVC update with previously unknown resourceName
or ClaimResourceStatus\nshould ignore the update
for the purpose it was designed. For example - a
controller that\nonly is responsible for resizing
capacity of the volume, should ignore PVC updates
that change other valid\nresources associated with
PVC.\n\n\nThis is an alpha field and requires enabling
PVC.\n\nThis is an alpha field and requires enabling
RecoverVolumeExpansionFailure feature."
type: object
x-kubernetes-map-type: granular
Expand All @@ -1827,7 +1827,7 @@ spec:
names such as \"example.com/my-custom-resource\"\nApart
from above values - keys that are unprefixed or
have kubernetes.io prefix are considered\nreserved
and hence may not be used.\n\n\nCapacity reported
and hence may not be used.\n\nCapacity reported
here may be larger than the actual capacity when
a volume expansion operation\nis requested.\nFor
storage quota, the larger value from allocatedResources
Expand All @@ -1837,13 +1837,13 @@ spec:
request is lowered, allocatedResources is only\nlowered
if there are no expansion operations in progress
and if the actual volume capacity\nis equal or lower
than the requested capacity.\n\n\nA controller that
than the requested capacity.\n\nA controller that
receives PVC update with previously unknown resourceName\nshould
ignore the update for the purpose it was designed.
For example - a controller that\nonly is responsible
for resizing capacity of the volume, should ignore
PVC updates that change other valid\nresources associated
with PVC.\n\n\nThis is an alpha field and requires
with PVC.\n\nThis is an alpha field and requires
enabling RecoverVolumeExpansionFailure feature."
type: object
capacity:
Expand Down Expand Up @@ -1888,8 +1888,16 @@ spec:
status:
type: string
type:
description: PersistentVolumeClaimConditionType
is a valid value of PersistentVolumeClaimCondition.Type
description: |-
PersistentVolumeClaimConditionType defines the condition of PV claim.
Valid values are:
- "Resizing", "FileSystemResizePending"
If RecoverVolumeExpansionFailure feature gate is enabled, then following additional values can be expected:
- "ControllerResizeError", "NodeResizeError"
If VolumeAttributesClass feature gate is enabled, then following additional values can be expected:
- "ModifyVolumeError", "ModifyingVolume"
type: string
required:
- status
Expand All @@ -1903,13 +1911,13 @@ spec:
description: |-
currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
This is an alpha field and requires enabling VolumeAttributesClass feature.
This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
type: string
modifyVolumeStatus:
description: |-
ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
When this is unset, there is no ModifyVolume operation being attempted.
This is an alpha field and requires enabling VolumeAttributesClass feature.
This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
properties:
status:
description: "status is the status of the ControllerModifyVolume
Expand Down
5 changes: 2 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module kubevirt.io/hostpath-provisioner-operator

go 1.22.3
toolchain go1.23.3
go 1.22.0

require (
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30
Expand All @@ -19,7 +18,7 @@ require (
github.com/openshift/custom-resource-status v1.1.2
github.com/operator-framework/api v0.27.0
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2
go.uber.org/zap v1.27.0
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 h1:Fm9Z+FabnB+6EoGq15j+pyLmaK6hYrYOpBlTzOLTQ+E=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1/go.mod h1:SvsRXw4m1F2vk7HquU5h475bFpke27mIUswfyw9u3ug=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 h1:6UsAv+jAevuGO2yZFU/BukV4o9NKnFMOuoouSA4G0ns=
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2/go.mod h1:XYrdZw5dW12Cjkt4ndbeNZZTBp4UCHtW0ccR9+sTtPU=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand Down
Loading

0 comments on commit dcbd191

Please sign in to comment.