OCPBUGS-100181: Rebase release-4.22 to Kubernetes v1.35.7 - #2729
OCPBUGS-100181: Rebase release-4.22 to Kubernetes v1.35.7#2729redhat-chai-bot wants to merge 25 commits into
Conversation
Move isLearner and isStarted variables to the outer var block of MemberPromote so their values are accessible after the poll loop. After the poll, if isLearner is false the member was already promoted, so return nil early without issuing a redundant promote call.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
When manageJob() needs to create replacement pods but defers creation
because a pod-failure backoff is still active, it returned a hardcoded
active=0 to the caller. Because no pods were actually created or deleted,
this left Status.Active=0 while Status.Ready still reflected the running
pods. The apiserver correctly rejects such updates ("cannot set more
ready pods than active") with a 422, which blocks flushing uncounted
terminated pods, removing finalizers, and updating job status, leaving
pods stuck Terminating with stale status.
Return the real active count from both backoff early-returns instead,
since the deferral does not change the number of active pods.
Issue: kubernetes#139428
(cherry picked from commit 2fe49b0)
…c996af Pins google.golang.org/protobuf to HEAD commit f2248ac996afc39b3df0777cdcc269f6ade50b07 (v1.36.12-0.20260120151049-f2248ac996af) which includes fixes for dead code elimination issues surfaced by Go 1.26's reflect changes. Xref: golang/protobuf#1704 Xref: kubernetes#137445 Signed-off-by: Davanum Srinivas <davanum@gmail.com>
During kubeadm join, the mandatory kubeadm-config ConfigMap fetch uses GetConfigMapWithShortRetry, which has a 350ms polling budget. When the API server is slow to respond, the single GET attempt blocks for up to 10 seconds (the client timeout), exhausting the polling budget with no retry. Since this call site has no fallback, the join fails. Add a shortConfigMapGet parameter to getInitConfigurationFromCluster and FetchInitConfigurationFromCluster. When false, the kubeadm-config ConfigMap is fetched using KubernetesAPICallTimeout (default 1 minute, user-configurable) with retries, matching the pattern used by getAPIEndpointFromPodAnnotation. When true, the existing GetConfigMapWithShortRetry is used for callers like kubeadm reset that don't need a long retry. Signed-off-by: Damiano Donati <damiano.donati@gmail.com>
…-of-139667-release-1.35 Automated cherry pick of kubernetes#139667: fix(kubeadm): use KubernetesAPICallTimeout for mandatory kubeadm-config fetch during join
…-of-#137451-upstream-release-1.35 Automated cherry pick of kubernetes#137451: Update google.golang.org/protobuf to v1.36.12-0.20260120151049-f2248ac996af to prevent file size explosion in go 1.26
…ck-of-#139964-upstream-release-1.35 [1.35] Automated cherry pick of kubernetes#139964: Restore string JSON encoding of cri-api KeyValue
Fix Go 1.26 vet errors
…erry-pick-of-#139457-upstream-release-1.35 Fix job controller reporting active=0 during pod creation backoff [1.35]
…-pick-of-#139842-upstream-release-1.35 Automated cherry pick of kubernetes#139842: kubeadm: treat already promoted learner as successful
…ck-of-#138390-origin-release-1.35 Automated cherry pick of kubernetes#138390: kubeadm: skip promote call when etcd member is already a voting member
…-pick-of-#138584-upstream-release-1.35 Automated cherry pick of kubernetes#138584: [chore] test/compatibility_lifecycle: resolve feature names from variables
…bles Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
…-pick-of-#140163-upstream-release-1.35 Automated cherry pick of kubernetes#140163: kubelet: stop logging missing optional container annotations
[release-1.35] Bump images and versions to golang 1.25.12 and update distroless-iptables
Kubernetes official release v1.35.7 # Conflicts: # staging/src/k8s.io/cri-api/go.mod # staging/src/k8s.io/kubelet/go.mod
openshift-ci-robot
added
the
backports/unvalidated-commits
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: openshift/coderabbit/.coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: redhat-chai-bot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
/retitle OCPBUGS-100177: Rebase release-4.22 to Kubernetes v1.35.7 |
openshift-ci
Bot
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100177, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
/retitle OCPBUGS-100181: Rebase release-4.22 to Kubernetes v1.35.7 |
openshift-ci
Bot
changed the title
|
@redhat-chai-bot: This pull request references Jira Issue OCPBUGS-100181, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
/jira-refresh |
jacobsee
left a comment
jacobsee
left a comment
There was a problem hiding this comment.
Conflict resolution needs to follow the standard documented process & be separated into its own commit. These results cast some doubt on the determinism of the patch rebase process, let's talk about it next week.
|
Acknowledged — same gap as #2728. The conflict resolution should have been in a separate |
|
@redhat-chai-bot: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. I understand the commands that are listed here. |
openshift-ci
Bot
added
the
needs-rebase
|
PR needs rebase. DetailsInstructions 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. |
16 participants
Summary
Rebases the
release-4.22branch from Kubernetes 1.35.6 to v1.35.7 (upstream release 2026-07-22).Conflicts Resolved
2 files — accepted upstream version:
cri-api/go.modkubelet/go.modOpenShift Dependencies
OpenShift deps (
openshift/api,client-go,library-go,apiserver-library-go) kept at their existing pinned versions. The newer branch heads pull in go 1.26 / k8s 1.36 APIs that are incompatible with k8s 1.35.@dusk125 requested in Slack thread