From 9f60cc3c4e8ddb373b1816a7e28b159db08f6a30 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 17 Mar 2026 16:23:57 -0700 Subject: [PATCH] hack/update-codegen.sh --- pkg/apis/core/v1/zz_generated.conversion.go | 8 ++--- pkg/apis/core/zz_generated.deepcopy.go | 6 +++- pkg/generated/openapi/zz_generated.openapi.go | 1 - .../src/k8s.io/api/core/v1/generated.pb.go | 29 ++++++++++++------- .../api/core/v1/zz_generated.deepcopy.go | 6 +++- .../core/v1/volumemountstatus.go | 17 ++++------- .../applyconfigurations/internal/internal.go | 1 - 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/pkg/apis/core/v1/zz_generated.conversion.go b/pkg/apis/core/v1/zz_generated.conversion.go index e81be7b109a..56ba4b5e9ad 100644 --- a/pkg/apis/core/v1/zz_generated.conversion.go +++ b/pkg/apis/core/v1/zz_generated.conversion.go @@ -9160,9 +9160,7 @@ func autoConvert_v1_VolumeMountStatus_To_core_VolumeMountStatus(in *corev1.Volum out.MountPath = in.MountPath out.ReadOnly = in.ReadOnly out.RecursiveReadOnly = (*core.RecursiveReadOnlyMode)(unsafe.Pointer(in.RecursiveReadOnly)) - if err := Convert_v1_VolumeStatus_To_core_VolumeStatus(&in.VolumeStatus, &out.VolumeStatus, s); err != nil { - return err - } + out.VolumeStatus = (*core.VolumeStatus)(unsafe.Pointer(in.VolumeStatus)) return nil } @@ -9176,9 +9174,7 @@ func autoConvert_core_VolumeMountStatus_To_v1_VolumeMountStatus(in *core.VolumeM out.MountPath = in.MountPath out.ReadOnly = in.ReadOnly out.RecursiveReadOnly = (*corev1.RecursiveReadOnlyMode)(unsafe.Pointer(in.RecursiveReadOnly)) - if err := Convert_core_VolumeStatus_To_v1_VolumeStatus(&in.VolumeStatus, &out.VolumeStatus, s); err != nil { - return err - } + out.VolumeStatus = (*corev1.VolumeStatus)(unsafe.Pointer(in.VolumeStatus)) return nil } diff --git a/pkg/apis/core/zz_generated.deepcopy.go b/pkg/apis/core/zz_generated.deepcopy.go index 1a21404e4a3..cfa645ea7e7 100644 --- a/pkg/apis/core/zz_generated.deepcopy.go +++ b/pkg/apis/core/zz_generated.deepcopy.go @@ -6563,7 +6563,11 @@ func (in *VolumeMountStatus) DeepCopyInto(out *VolumeMountStatus) { *out = new(RecursiveReadOnlyMode) **out = **in } - in.VolumeStatus.DeepCopyInto(&out.VolumeStatus) + if in.VolumeStatus != nil { + in, out := &in.VolumeStatus, &out.VolumeStatus + *out = new(VolumeStatus) + (*in).DeepCopyInto(*out) + } return } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 95edd8b539b..64f09012ab0 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -32941,7 +32941,6 @@ func schema_k8sio_api_core_v1_VolumeMountStatus(ref common.ReferenceCallback) co "volumeStatus": { SchemaProps: spec.SchemaProps{ Description: "volumeStatus represents volume-type-specific status about the mounted volume.", - Default: map[string]interface{}{}, Ref: ref(corev1.VolumeStatus{}.OpenAPIModelName()), }, }, diff --git a/staging/src/k8s.io/api/core/v1/generated.pb.go b/staging/src/k8s.io/api/core/v1/generated.pb.go index eeb2e45c11c..596a163f6e3 100644 --- a/staging/src/k8s.io/api/core/v1/generated.pb.go +++ b/staging/src/k8s.io/api/core/v1/generated.pb.go @@ -14218,16 +14218,18 @@ func (m *VolumeMountStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { - size, err := m.VolumeStatus.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.VolumeStatus != nil { + { + size, err := m.VolumeStatus.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x2a } - i-- - dAtA[i] = 0x2a if m.RecursiveReadOnly != nil { i -= len(*m.RecursiveReadOnly) copy(dAtA[i:], *m.RecursiveReadOnly) @@ -20145,8 +20147,10 @@ func (m *VolumeMountStatus) Size() (n int) { l = len(*m.RecursiveReadOnly) n += 1 + l + sovGenerated(uint64(l)) } - l = m.VolumeStatus.Size() - n += 1 + l + sovGenerated(uint64(l)) + if m.VolumeStatus != nil { + l = m.VolumeStatus.Size() + n += 1 + l + sovGenerated(uint64(l)) + } return n } @@ -24243,7 +24247,7 @@ func (this *VolumeMountStatus) String() string { `MountPath:` + fmt.Sprintf("%v", this.MountPath) + `,`, `ReadOnly:` + fmt.Sprintf("%v", this.ReadOnly) + `,`, `RecursiveReadOnly:` + valueToStringGenerated(this.RecursiveReadOnly) + `,`, - `VolumeStatus:` + strings.Replace(strings.Replace(this.VolumeStatus.String(), "VolumeStatus", "VolumeStatus", 1), `&`, ``, 1) + `,`, + `VolumeStatus:` + strings.Replace(this.VolumeStatus.String(), "VolumeStatus", "VolumeStatus", 1) + `,`, `}`, }, "") return s @@ -68474,6 +68478,9 @@ func (m *VolumeMountStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.VolumeStatus == nil { + m.VolumeStatus = &VolumeStatus{} + } if err := m.VolumeStatus.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go index 4585cf3ca57..f91c2f9d156 100644 --- a/staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go @@ -6573,7 +6573,11 @@ func (in *VolumeMountStatus) DeepCopyInto(out *VolumeMountStatus) { *out = new(RecursiveReadOnlyMode) **out = **in } - in.VolumeStatus.DeepCopyInto(&out.VolumeStatus) + if in.VolumeStatus != nil { + in, out := &in.VolumeStatus, &out.VolumeStatus + *out = new(VolumeStatus) + (*in).DeepCopyInto(*out) + } return } diff --git a/staging/src/k8s.io/client-go/applyconfigurations/core/v1/volumemountstatus.go b/staging/src/k8s.io/client-go/applyconfigurations/core/v1/volumemountstatus.go index 0fdeb634fbd..693268ecb11 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/core/v1/volumemountstatus.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/core/v1/volumemountstatus.go @@ -39,7 +39,7 @@ type VolumeMountStatusApplyConfiguration struct { RecursiveReadOnly *corev1.RecursiveReadOnlyMode `json:"recursiveReadOnly,omitempty"` // volumeStatus represents volume-type-specific status about the mounted // volume. - *VolumeStatusApplyConfiguration `json:"volumeStatus,omitempty"` + VolumeStatus *VolumeStatusApplyConfiguration `json:"volumeStatus,omitempty"` } // VolumeMountStatusApplyConfiguration constructs a declarative configuration of the VolumeMountStatus type for use with @@ -80,17 +80,10 @@ func (b *VolumeMountStatusApplyConfiguration) WithRecursiveReadOnly(value corev1 return b } -// WithImage sets the Image field in the declarative configuration to the given value +// WithVolumeStatus sets the VolumeStatus field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. -// If called multiple times, the Image field is set to the value of the last call. -func (b *VolumeMountStatusApplyConfiguration) WithImage(value *ImageVolumeStatusApplyConfiguration) *VolumeMountStatusApplyConfiguration { - b.ensureVolumeStatusApplyConfigurationExists() - b.VolumeStatusApplyConfiguration.Image = value +// If called multiple times, the VolumeStatus field is set to the value of the last call. +func (b *VolumeMountStatusApplyConfiguration) WithVolumeStatus(value *VolumeStatusApplyConfiguration) *VolumeMountStatusApplyConfiguration { + b.VolumeStatus = value return b } - -func (b *VolumeMountStatusApplyConfiguration) ensureVolumeStatusApplyConfigurationExists() { - if b.VolumeStatusApplyConfiguration == nil { - b.VolumeStatusApplyConfiguration = &VolumeStatusApplyConfiguration{} - } -} diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index 7a66deaf482..c6acb6d7e3d 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -8423,7 +8423,6 @@ var schemaYAML = typed.YAMLObject(`types: - name: volumeStatus type: namedType: io.k8s.api.core.v1.VolumeStatus - default: {} - name: io.k8s.api.core.v1.VolumeNodeAffinity map: fields: