Skip to content
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

Document changing the sandbox image in CR #33660

Merged
merged 2 commits into from
Jun 17, 2022

Conversation

domgoodwin
Copy link
Contributor

@domgoodwin domgoodwin commented May 14, 2022

Adds documentation around how to overwrite the pause/sandbox image in an airgapped environment.

Also adds mention to these instructions in the kubeadm-init page

closes #33613

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 14, 2022
@@ -266,6 +266,49 @@ visit [MCR Deployment Guide](https://docs.mirantis.com/mcr/20.10/install.html).
Check the systemd unit named `cri-docker.socket` to find out the path to the CRI
socket.

## Overriding the sandbox (pause) image
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure if this should be it's own section or sub headings under the other CR docs, felt nice to keep this separate.

Copy link
Member

Choose a reason for hiding this comment

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

I think these should be separate sub sections under the individual CRs.

@k8s-ci-robot k8s-ci-robot added the language/en Issues or PRs related to English language label May 14, 2022
@k8s-ci-robot k8s-ci-robot requested review from bart0sh and vincepri May 14, 2022 09:37
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label May 14, 2022
@netlify
Copy link

netlify bot commented May 14, 2022

Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit 58f04be
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/62a638358d4ad90008872c9c
😎 Deploy Preview https://deploy-preview-33660--kubernetes-io-main-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

Thanks for this PR @domgoodwin
Added a couple if comments but this looks good to me overall.

/sig node cluster-lifecycle

@@ -266,6 +266,49 @@ visit [MCR Deployment Guide](https://docs.mirantis.com/mcr/20.10/install.html).
Check the systemd unit named `cri-docker.socket` to find out the path to the CRI
socket.

## Overriding the sandbox (pause) image
Copy link
Member

Choose a reason for hiding this comment

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

I think these should be separate sub sections under the individual CRs.

#### Custom sandbox (pause) images

Container runtimes are responsible for their sandbox images, a common default being `k8s.gcr.io/pause`.
To set a custom image for these you need to [configure the container-runtime](/docs/setup/production-environment/container-runtimes/#overriding-the-sandbox-pause-image)
Copy link
Member

Choose a reason for hiding this comment

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

Here we can just link to the main CR page ALA "find how to setup the pause image for your CR of choice"

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels May 16, 2022
@k8s-ci-robot
Copy link
Contributor

@neolit123: The label(s) /label tide/merge-merge-method-squash cannot be applied. These labels are supported: api-review, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, team/katacoda, refactor

In response to this:

/label tide/merge-merge-method-squash

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/test-infra repository.

@neolit123
Copy link
Member

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label May 16, 2022
Comment on lines 300 to 305
### Docker Engine and Mirantis Container Runtime

{{< note >}}
If using the Docker Engine these instructions assume that you are using the
[`cri-dockerd`](https://github.com/Mirantis/cri-dockerd) adapter to integrate
Docker Engine with Kubernetes.
{{< /note >}}

Copy link
Member

Choose a reason for hiding this comment

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

i think we can omit this addition given both sections ### Docker Engine and ### Mirantis Container Runtime already mention cri-dockerd?

Comment on lines 282 to 284
To overwrite the sandbox (pause) image the `cri-dockerd` adapter
[accepts a flag](https://github.com/Mirantis/cri-dockerd/blob/master/src/config/options.go)
to configure this `--pod-infra-container-image`.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
To overwrite the sandbox (pause) image the `cri-dockerd` adapter
[accepts a flag](https://github.com/Mirantis/cri-dockerd/blob/master/src/config/options.go)
to configure this `--pod-infra-container-image`.
To overwrite the sandbox (pause) image the [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd) adapter
accepts the `--pod-infra-container-image` flag.

instead of linking to the source code, suggesting that we link to the main cri-dockerd page with hopes that its documentation will enumerate flags eventually.

Comment on lines 280 to 284
#### Overriding the sandbox (pause) image

To overwrite the sandbox (pause) image the `cri-dockerd` adapter
[accepts a flag](https://github.com/Mirantis/cri-dockerd)
to configure this `--pod-infra-container-image`.
Copy link
Member

@neolit123 neolit123 May 16, 2022

Choose a reason for hiding this comment

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

we can just duplicate this section under ### Mirantis Container Runtime, given both use cri-dockerd.
this is what i meant here:
#33660 (comment)

@neolit123
Copy link
Member

You can assign the PR to them by writing /assign @sftim in a comment when ready.

/assign @sftim
as per the bot's suggestion.

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

LGTM label has been added.

Git tree hash: 70732dae0185672ccb22078b92b496474a91c49c

@neolit123
Copy link
Member

other than this detail the change LGTM. thanks!

/lgtm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2022
@k8s-ci-robot k8s-ci-robot requested review from neolit123 and sftim May 16, 2022 21:25
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: a9577aa3c910675b3bf9283688c5b40750e6c4ba

sftim
sftim previously requested changes May 26, 2022
Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

I'd prefer not to have several headings in the same page that have identical text, unless we give them suitable custom fragment identifiers.

I also made some other style / content suggestions; these are less important.

Comment on lines 248 to 253
To set a custom image for these you need to configure this in your [container runtime](/docs/setup/production-environment/container-runtimes/)
to use the image.

Copy link
Contributor

Choose a reason for hiding this comment

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

We don't document all container runtimes and we don't have a lot of capacity to maintain docs for
lots of container runtimes. Ideally we'd be able to link to container runtimes' docs on this, however those docs aren't there to link to.

So, we need to compromise.

How about:

Suggested change
To set a custom image for these you need to configure this in your [container runtime](/docs/setup/production-environment/container-runtimes/)
to use the image.
To set a custom image for these you need to configure this in your
{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}
to use the image.
Consult the documentation for your container runtime to find out how to change this setting;
for selected container runtimes, you can also find advice within the
[Container Runtimes]((/docs/setup/production-environment/container-runtimes/) topic.

Copy link
Contributor

Choose a reason for hiding this comment

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

💭 are there any container runtimes that work properly with Kubernetes and that don't use a pause image at all?

@sftim
Copy link
Contributor

sftim commented May 26, 2022

BTW, @domgoodwin: if you know how to do a squash on your side, please do. That's slightly tidier.

No worries though if you're not sure.

@domgoodwin domgoodwin force-pushed the docs-pause-container branch from 6dcf806 to 88885dd Compare May 26, 2022 15:13
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2022
@k8s-ci-robot k8s-ci-robot requested review from neolit123 and sftim May 26, 2022 15:13
@domgoodwin
Copy link
Contributor Author

Thanks @sftim I've added those changes now and merged all commits into 1. I'm too used to squashing on PR merge!

Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/lgtm
@sftim PTAL again

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

LGTM label has been added.

Git tree hash: ed77052921705e0e937090f7cb975d2ff0cfb985

@Sea-n
Copy link
Member

Sea-n commented Jun 7, 2022

(Since the author force-pushed with squashed commit 12 days ago)
/remove-label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot removed the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 7, 2022
@sftim sftim dismissed their stale review June 12, 2022 18:21

Previous review was stale

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 12, 2022
@k8s-ci-robot k8s-ci-robot requested review from neolit123 and sftim June 12, 2022 19:02
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: 9fbf1adb81f161b695396faea8b7d15c16a65749

@Sea-n
Copy link
Member

Sea-n commented Jun 13, 2022

Add back label if @domgoodwin are not going to squash commits by their-self.
/label tide/merge-method-squash

Note: Free to use /remove-label tide/merge-method-squash command after squash commits & force push.

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 13, 2022
@zacharysarah
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 1145cab into kubernetes:main Jun 17, 2022
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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/docs Categorizes an issue or PR as relevant to SIG Docs. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Document how to change pause image in CR page
6 participants