Skip to content

Check for newer fields when deciding expansion recovery feature status #131418

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.

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

Merged

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Apr 23, 2025

Fixes #131402

Apart from tests here, I have manually verified that this works as expected:

Before:

apiVersion: v1
kind: PersistentVolumeClaim
metadata:
  annotations:
  finalizers:
  - kubernetes.io/pvc-protection
  name: csi-pvc
  namespace: vim1
  resourceVersion: "574"
spec:
  accessModes:
  - ReadWriteOnce
  resources:
    requests:
      storage: 4Gi
  storageClassName: csi-hostpath-sc
  volumeMode: Filesystem
  volumeName: pvc-7ba4e352-5b28-494c-b68b-c2fbaf9d6221
status:
  accessModes:
  - ReadWriteOnce
  allocatedResourceStatuses:
    storage: NodeResizePending
  allocatedResources:
    storage: 4Gi
  capacity:
    storage: 4Gi
  phase: Bound

After:

---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
  finalizers:
  - kubernetes.io/pvc-protection
  name: csi-pvc
  namespace: vim1
spec:
  accessModes:
  - ReadWriteOnce
  resources:
    requests:
      storage: 6Gi
  storageClassName: csi-hostpath-sc
  volumeMode: Filesystem
  volumeName: pvc-7ba4e352-5b28-494c-b68b-c2fbaf9d6221
status:
  accessModes:
  - ReadWriteOnce
  allocatedResourceStatuses:
    storage: NodeResizeInProgress
  allocatedResources:
    storage: 6Gi
  capacity:
    storage: 4Gi
  conditions:
  - lastProbeTime: null
    lastTransitionTime: "2025-04-23T20:03:23Z"
    status: "True"
    type: Resizing
  - lastProbeTime: null
    lastTransitionTime: "2025-04-23T20:03:23Z"
    message: Waiting for user to (re-)start a pod to finish file system resize of
      volume on node.
    status: "True"
    type: FileSystemResizePending
  phase: Bound
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
  finalizers:
  - kubernetes.io/pvc-protection
  name: csi-pvc
  namespace: vim1
  resourceVersion: "763"
spec:
  accessModes:
  - ReadWriteOnce
  resources:
    requests:
      storage: 6Gi
  storageClassName: csi-hostpath-sc
  volumeMode: Filesystem
  volumeName: pvc-7ba4e352-5b28-494c-b68b-c2fbaf9d6221
status:
  accessModes:
  - ReadWriteOnce
  allocatedResources:
    storage: 6Gi
  capacity:
    storage: 6Gi
  phase: Bound

/sig storage

Check for newer resize fields when deciding recovery feature's status in kubelet

@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.33 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.33.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Wed Apr 23 13:35:19 UTC 2025.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Apr 23, 2025
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 23, 2025
@gnufied
Copy link
Member Author

gnufied commented Apr 23, 2025

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Apr 23, 2025
@gnufied
Copy link
Member Author

gnufied commented Apr 23, 2025

/test pull-kubernetes-e2e-gce

@msau42
Copy link
Member

msau42 commented Apr 23, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 23, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 24ac1ef2fa6ead82e4d2153acef8440a18523fb5

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied, msau42

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pacoxu
Copy link
Member

pacoxu commented Apr 24, 2025

/test pull-kubernetes-e2e-gce

@k8s-ci-robot k8s-ci-robot merged commit 5ec7b65 into kubernetes:master Apr 24, 2025
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.34 milestone Apr 24, 2025
k8s-ci-robot added a commit that referenced this pull request May 14, 2025
…418-upstream-release-1.31

Automated cherry pick of #131418: Check for newer fields when deciding expansion recovery feature status
k8s-ci-robot added a commit that referenced this pull request May 14, 2025
…418-upstream-release-1.32

Automated cherry pick of #131418: Check for newer fields when deciding expansion recovery feature status
k8s-ci-robot added a commit that referenced this pull request May 14, 2025
…418-upstream-release-1.33

Automated cherry pick of #131418: Check for newer fields when deciding expansion recovery feature status
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NodeResizePending status not removed after successful NodeExpandVolume
4 participants