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

Allow configuring CRI-O for use in offline environments #6927

Merged

Conversation

basvandenbrink
Copy link
Contributor

@basvandenbrink basvandenbrink commented Nov 18, 2020

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
In order to be able to install Kubernetes using Kubespray in an offline environment, we need to introduce two configuration variables:

  • crio_add_repos (default true): this allows for disabling configuring package repositories for CRI-O, so that custom internal package repositories can be used.
  • crio_insecure_registries: this allows for configuring insecure registries for CRI-O, so that an internal container image registry can be used in a way that would be insecure for publishing on the internet.

Which issue(s) this PR fixes:
Fixes #6233

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Allow disabling configuring CRI-O package repositories
Allow setting insecure contaner image registries for CRI-O

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 18, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @basvandenbrink!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @basvandenbrink. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 18, 2020
@basvandenbrink basvandenbrink changed the title [WIP] Allow configuring CRI-O for use in offline environments Allow configuring CRI-O for use in offline environments Nov 18, 2020
@basvandenbrink basvandenbrink marked this pull request as ready for review November 18, 2020 14:54
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 18, 2020
@basvandenbrink
Copy link
Contributor Author

/assign @LuckySB

@basvandenbrink
Copy link
Contributor Author

I wasn't able to relate the failing test to the code I submitted.

@floryut
Copy link
Member

floryut commented Nov 23, 2020

@basvandenbrink now that #6910 is merged, could you please rebase master ? Thank you!

@floryut
Copy link
Member

floryut commented Nov 25, 2020

@basvandenbrink hum.. why did you repushed all your branches/PR ? CI was already green and no new changes were pushed

@basvandenbrink
Copy link
Contributor Author

@basvandenbrink hum.. why did you repushed all your branches/PR ? CI was already green and no new changes were pushed

I noticed that I did a merge instead of a rebase. Sorry if I got it wrong and it wasn't necessary.

@floryut
Copy link
Member

floryut commented Nov 25, 2020

@basvandenbrink hum.. why did you repushed all your branches/PR ? CI was already green and no new changes were pushed

I noticed that I did a merge instead of a rebase. Sorry if I got it wrong and it wasn't necessary.

Hum, ok my bad I didn't look at the commit history, sorry you were right 👍

@LuckySB
Copy link
Contributor

LuckySB commented Nov 26, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: basvandenbrink, LuckySB

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 Nov 26, 2020
@LuckySB
Copy link
Contributor

LuckySB commented Nov 27, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 27, 2020
@LuckySB
Copy link
Contributor

LuckySB commented Nov 27, 2020

@basvandenbrink can you rebase, to include docker pull rate limit fix #6957 ?

@LuckySB
Copy link
Contributor

LuckySB commented Nov 28, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 28, 2020
@k8s-ci-robot k8s-ci-robot merged commit 17fb1ce into kubernetes-sigs:master Nov 28, 2020
@basvandenbrink basvandenbrink deleted the airgapped-crio branch November 29, 2020 21:18
@floryut floryut mentioned this pull request Dec 19, 2020
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 16, 2021
oomichi pushed a commit to oomichi/kubespray that referenced this pull request Apr 1, 2021
The PR kubernetes-sigs#6927 has been
merged and the issue kubernetes-sigs#6233
was fixed.
This removes unnecessary note for the above PR.
k8s-ci-robot pushed a commit that referenced this pull request Apr 2, 2021
The PR #6927 has been
merged and the issue #6233
was fixed.
This removes unnecessary note for the above PR.
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Apr 6, 2021
The PR kubernetes-sigs#6927 has been
merged and the issue kubernetes-sigs#6233
was fixed.
This removes unnecessary note for the above PR.
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
The PR kubernetes-sigs#6927 has been
merged and the issue kubernetes-sigs#6233
was fixed.
This removes unnecessary note for the above PR.
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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CRI-O tasks not supporting offline installation
4 participants