Skip to content

Remove unused kubelet flag --pod-infra-container-image#17657

Merged
k8s-ci-robot merged 3 commits intokubernetes:masterfrom
hakman:remove-pod-infra-container-image
Oct 13, 2025
Merged

Remove unused kubelet flag --pod-infra-container-image#17657
k8s-ci-robot merged 3 commits intokubernetes:masterfrom
hakman:remove-pod-infra-container-image

Conversation

@hakman
Copy link
Copy Markdown
Member

@hakman hakman commented Oct 11, 2025

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/api area/nodeup labels Oct 11, 2025
@hakman hakman force-pushed the remove-pod-infra-container-image branch from 1470291 to c553d26 Compare October 11, 2025 09:16
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 11, 2025

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2025
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 11, 2025

/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-kuberouter

Details

In response to this:

/override pull-kops-e2e-cni-kuberouter

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 11, 2025

/retest

// PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
PodInfraContainerImage string `json:"podInfraContainerImage,omitempty" flag:"pod-infra-container-image"`
// DEPRECATED: Image garbage collector will get sandbox image information from CRI
PodInfraContainerImage string `json:"-"`
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No objection to deprecation, but if we remove the field I think we break anyone who was setting this field, in a way that is very hard to recover (like I don't even know if kops edit will load the object). I think in the past we have left the field as-is, but often logged a warning or an error in validation if it is set. Given this is kubeletConfig (and not a top-level configuration), I think an error is reasonable

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the past we did both, but you are right here, we want to keep the json field for validation purposes.


{
// Flag removed in 1.6
if k.PodInfraContainerImage != "" {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, lgtm!

If it was removed in 1.6 maybe we might bet that nobody is setting it! I guess it depends on whether kops edit still works.... But I think if you remove the json tag we also will never hit this because we won't populate the field value?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy/paste omission, it was deprecated in 1.24 and will be removed in 1.35.
The long deprecation is due to lack of image pinning support on containerd side until more recent releases.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2025
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
@hakman hakman force-pushed the remove-pod-infra-container-image branch from 12b861f to b5937b2 Compare October 12, 2025 05:35
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 12, 2025
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
@hakman hakman force-pushed the remove-pod-infra-container-image branch from b5937b2 to 9582069 Compare October 12, 2025 06:03
@justinsb
Copy link
Copy Markdown
Member

/approve
/lgtm

/retest

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, justinsb

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

The pull request process is described here

Details 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

@k8s-triage-robot
Copy link
Copy Markdown

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

1 similar comment
@k8s-triage-robot
Copy link
Copy Markdown

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 12, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-calico-eni
/override pull-kops-e2e-cni-calico-etcd
/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • pull-kops-e2e-cni-calico-eni
  • pull-kops-e2e-cni-calico-etcd

Only the following failed contexts/checkruns were expected:

  • EasyCLA
  • build-linux-amd64
  • build-linux-arm64
  • build-macos-amd64
  • build-windows-amd64
  • deploy/netlify
  • pull-kops-build
  • pull-kops-e2e-azure-cni-cilium
  • pull-kops-e2e-cni-amazonvpc
  • pull-kops-e2e-cni-calico
  • pull-kops-e2e-cni-calico-ipv6
  • pull-kops-e2e-cni-cilium
  • pull-kops-e2e-cni-cilium-eni
  • pull-kops-e2e-cni-cilium-etcd
  • pull-kops-e2e-cni-cilium-ipv6
  • pull-kops-e2e-cni-kuberouter
  • pull-kops-e2e-gce-cni-calico
  • pull-kops-e2e-gce-cni-cilium
  • pull-kops-e2e-k8s-aws-amazonvpc
  • pull-kops-e2e-k8s-aws-calico
  • pull-kops-e2e-k8s-gce-cilium
  • pull-kops-e2e-k8s-gce-ipalias
  • pull-kops-test
  • pull-kops-verify-boilerplate
  • pull-kops-verify-generated
  • pull-kops-verify-gofmt
  • pull-kops-verify-golangci-lint
  • pull-kops-verify-gomod
  • pull-kops-verify-govet
  • pull-kops-verify-terraform
  • tests-e2e-scenarios-bare-metal
  • tests-e2e-scenarios-bare-metal-ipv6
  • tide
  • verify-amd64
  • verify-arm64

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-calico-eni
/override pull-kops-e2e-cni-calico-etcd
/override pull-kops-e2e-cni-kuberouter

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 12, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico-ipv6, pull-kops-e2e-cni-cilium-eni, pull-kops-e2e-cni-cilium-etcd, pull-kops-e2e-cni-kuberouter

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 12, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter
/override pull-kops-e2e-k8s-aws-amazonvpc

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico-ipv6, pull-kops-e2e-cni-cilium-eni, pull-kops-e2e-cni-cilium-etcd, pull-kops-e2e-cni-kuberouter, pull-kops-e2e-k8s-aws-amazonvpc

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter
/override pull-kops-e2e-k8s-aws-amazonvpc

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 12, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter
/override pull-kops-e2e-k8s-aws-amazonvpc

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico-ipv6, pull-kops-e2e-cni-cilium-eni, pull-kops-e2e-cni-cilium-etcd, pull-kops-e2e-cni-kuberouter, pull-kops-e2e-k8s-aws-amazonvpc

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter
/override pull-kops-e2e-k8s-aws-amazonvpc

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 12, 2025

/test all

@k8s-triage-robot
Copy link
Copy Markdown

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 13, 2025

/retest

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 13, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico-ipv6, pull-kops-e2e-cni-cilium-eni, pull-kops-e2e-cni-cilium-etcd, pull-kops-e2e-cni-kuberouter

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 13, 2025

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico-ipv6, pull-kops-e2e-cni-cilium-eni, pull-kops-e2e-cni-cilium-etcd, pull-kops-e2e-cni-kuberouter

Details

In response to this:

/override pull-kops-e2e-cni-calico-ipv6
/override pull-kops-e2e-cni-cilium-eni
/override pull-kops-e2e-cni-cilium-etcd
/override pull-kops-e2e-cni-kuberouter

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.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Oct 13, 2025

/override pull-kops-e2e-cni-calico
/override pull-kops-e2e-cni-cilium
/override pull-kops-e2e-cni-cilium-ipv6
/override pull-kops-e2e-k8s-aws-amazonvpc

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-calico, pull-kops-e2e-cni-cilium, pull-kops-e2e-cni-cilium-ipv6, pull-kops-e2e-k8s-aws-amazonvpc

Details

In response to this:

/override pull-kops-e2e-cni-calico
/override pull-kops-e2e-cni-cilium
/override pull-kops-e2e-cni-cilium-ipv6
/override pull-kops-e2e-k8s-aws-amazonvpc

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 merged commit 476a8af into kubernetes:master Oct 13, 2025
38 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.35 milestone Oct 13, 2025
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. area/api area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants