From fd1786f8738751cdf9ddc6ad0bdb00a038883421 Mon Sep 17 00:00:00 2001 From: Roman Bednar Date: Tue, 16 Jan 2024 11:28:00 +0100 Subject: [PATCH 1/3] flag PersistentVolumeLastPhaseTransitionTime field as beta Kubernetes-commit: 4a0a7e809237e74afd4ea1499520063f96158e1e --- core/v1/generated.proto | 2 +- core/v1/types.go | 2 +- core/v1/types_swagger_doc_generated.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/v1/generated.proto b/core/v1/generated.proto index cf9b6e6ebc..d099238cdf 100644 --- a/core/v1/generated.proto +++ b/core/v1/generated.proto @@ -3286,7 +3286,7 @@ message PersistentVolumeStatus { // lastPhaseTransitionTime is the time the phase transitioned from one to another // and automatically resets to current time everytime a volume phase transitions. - // This is an alpha field and requires enabling PersistentVolumeLastPhaseTransitionTime feature. + // This is a beta field and requires the PersistentVolumeLastPhaseTransitionTime feature to be enabled (enabled by default). // +featureGate=PersistentVolumeLastPhaseTransitionTime // +optional optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastPhaseTransitionTime = 4; diff --git a/core/v1/types.go b/core/v1/types.go index 1aade3806f..61ba21bcad 100644 --- a/core/v1/types.go +++ b/core/v1/types.go @@ -423,7 +423,7 @@ type PersistentVolumeStatus struct { Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` // lastPhaseTransitionTime is the time the phase transitioned from one to another // and automatically resets to current time everytime a volume phase transitions. - // This is an alpha field and requires enabling PersistentVolumeLastPhaseTransitionTime feature. + // This is a beta field and requires the PersistentVolumeLastPhaseTransitionTime feature to be enabled (enabled by default). // +featureGate=PersistentVolumeLastPhaseTransitionTime // +optional LastPhaseTransitionTime *metav1.Time `json:"lastPhaseTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastPhaseTransitionTime"` diff --git a/core/v1/types_swagger_doc_generated.go b/core/v1/types_swagger_doc_generated.go index 01152a0964..fd6f7dc61b 100644 --- a/core/v1/types_swagger_doc_generated.go +++ b/core/v1/types_swagger_doc_generated.go @@ -1478,7 +1478,7 @@ var map_PersistentVolumeStatus = map[string]string{ "phase": "phase indicates if a volume is available, bound to a claim, or released by a claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#phase", "message": "message is a human-readable message indicating details about why the volume is in this state.", "reason": "reason is a brief CamelCase string that describes any failure and is meant for machine parsing and tidy display in the CLI.", - "lastPhaseTransitionTime": "lastPhaseTransitionTime is the time the phase transitioned from one to another and automatically resets to current time everytime a volume phase transitions. This is an alpha field and requires enabling PersistentVolumeLastPhaseTransitionTime feature.", + "lastPhaseTransitionTime": "lastPhaseTransitionTime is the time the phase transitioned from one to another and automatically resets to current time everytime a volume phase transitions. This is a beta field and requires the PersistentVolumeLastPhaseTransitionTime feature to be enabled (enabled by default).", } func (PersistentVolumeStatus) SwaggerDoc() map[string]string { From f5eca0431ee2abce8d0cb9c21388389010218771 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 8 Feb 2024 18:51:48 -0800 Subject: [PATCH 2/3] Merge pull request #122959 from RomanBednar/automated-cherry-pick-of-#122728-upstream-release-1.29 Automated cherry pick of #122728: flag PersistentVolumeLastPhaseTransitionTime field as beta Kubernetes-commit: bfa76a98638497ab374273690db558186aecd1c7 From d47313059888ec984bf8432ed155fae5be935c31 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 14 Feb 2024 21:26:37 +0000 Subject: [PATCH 3/3] Update dependencies to v0.29.2 tag --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1e1583c9cd..1057f813fc 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ go 1.21 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.8.4 - k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 + k8s.io/apimachinery v0.29.2 ) require ( @@ -36,4 +36,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 +replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.2 diff --git a/go.sum b/go.sum index bc8031287f..092e4e0faf 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 h1:SfqmT8ezTnkZc9G0t8b4s6+Z6zT/rMKhZm9yQq5wG+U= -k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=