crio container runtime crio_registries path fix #11030

pedro-peter · 2024-03-23T14:22:05Z

What type of PR is this?
/kind bug

What this PR does / why we need it :
when using the crio container runtime and enabling crio_registries:
https://github.com/kubernetes-sigs/kubespray/blob/master/docs/cri-o.md#allcrioyml

if the registry prefix or location variables contain paths (e.g. location: "my-registry/location/prod") the container-engine/cri-o : Cri-o | write registries configs task fails.

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

Special notes for your reviewer :
the task:
https://github.com/kubernetes-sigs/kubespray/blob/master/roles/container-engine/cri-o/tasks/main.yaml#L158

replaces : -> _. This PR will do the same for /. I.E. replace / -> _

inventory:

vars
:
  
container_manager
: 
crio

  #
 remap my-registry prod path -> testing

  crio_registries
:
    - 
prefix
: 
"
my-registry/location/prod
"

      insecure
: 
false

      blocked
: 
false

      location
: 
"
my-registry/location/testing
"

      unqualified
: 
false

will result in file:

ls /etc/containers/registries.conf.d
01-unqualified.conf  10-my-registry_location_prod_config.conf

Does this PR introduce a user-facing change? :

 fix crio registries config file when using slashes in the registry path

k8s-ci-robot · 2024-03-23T14:22:15Z

Hi @pedro-peter . 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.

pedro-peter · 2024-03-23T17:34:03Z

/kind bug

yankay · 2024-03-28T01:56:49Z

/ok-to-test

yankay · 2024-04-02T06:48:07Z

Thanks @pedro-peter
/approve

k8s-ci-robot · 2024-04-02T06:48:14Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pedro-peter , yankay

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:

~~OWNERS~~ [yankay]

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

VannTen

I think it should be better to have a dict instead of an array, and use the key for the filename instead of hijacking location or prefix like that. But it's not worth a breaking change (which it would be) so let's settle for regex_replace.

roles/container-engine/cri-o/tasks/main.yaml

linux-foundation-easycla · 2024-05-08T16:40:20Z

The committers listed above are authorized under a signed CLA.

? login: pedro-peter / name: peterw ( 0a01f54)

VannTen · 2024-05-08T19:54:39Z

Looks ok to me but a few things: - the release note should be more explicit about what is fixed - you should probably rebase on master, I think the amazon Linux ci failure is fixed here

pedro-peter · 2024-05-09T12:21:05Z

updated release note & rebased of master.

VannTen · 2024-05-09T12:29:22Z

Please rebase, I don't think the cilium stuff is related ?

VannTen · 2024-05-17T09:38:13Z

/lgtm

pedro-peter · 2024-05-17T11:40:39Z

thanks @VannTen

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 23, 2024

k8s-ci-robot requested review from cyclinder and ErikJiang March 23, 2024 14:22

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 23, 2024

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 23, 2024

pedro-peter changed the title ~~crio registry rewrite patch~~ crio container runtime crio_registries path fix Mar 23, 2024

k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Mar 23, 2024

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 Mar 28, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2024

VannTen suggested changes May 3, 2024

View reviewed changes

roles/container-engine/cri-o/tasks/main.yaml Outdated Show resolved Hide resolved

pedro-peter force-pushed the crio-registry-rewrite-fix branch from eeac5d8 to 0f30e7d Compare May 8, 2024 16:27

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 8, 2024

pedro-peter force-pushed the crio-registry-rewrite-fix branch from 0f30e7d to a9880f8 Compare May 8, 2024 16:33

pedro-peter force-pushed the crio-registry-rewrite-fix branch from a9880f8 to cc38314 Compare May 8, 2024 16:40

k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label May 8, 2024

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels May 8, 2024

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 8, 2024

pedro-peter force-pushed the crio-registry-rewrite-fix branch from cc38314 to 6c597c5 Compare May 8, 2024 16:52

pedro-peter force-pushed the crio-registry-rewrite-fix branch from 6c597c5 to d0c41d4 Compare May 9, 2024 12:19

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 9, 2024

pedro-peter force-pushed the crio-registry-rewrite-fix branch from d0c41d4 to 32aab21 Compare May 9, 2024 15:14

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 9, 2024

crio container runtime crio_registries path fix

0a01f54

pedro-peter force-pushed the crio-registry-rewrite-fix branch from 32aab21 to 0a01f54 Compare May 13, 2024 09:36

k8s-ci-robot assigned VannTen May 17, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2024

k8s-ci-robot merged commit 0b464b5 into kubernetes-sigs : master May 17, 2024
62 checks passed

itayporezky pushed a commit to itayporezky/kubespray that referenced this pull request May 19, 2024

crio container runtime crio_registries path fix ( kubernetes-sigs#11030 )

116ee5d

mzaian mentioned this pull request May 21, 2024

Release Proposal v2.25 #11126

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

crio container runtime crio_registries path fix #11030

crio container runtime crio_registries path fix #11030

pedro-peter commented Mar 23, 2024 •

edited

k8s-ci-robot commented Mar 23, 2024

pedro-peter commented Mar 23, 2024

yankay commented Mar 28, 2024

yankay commented Apr 2, 2024

k8s-ci-robot commented Apr 2, 2024

VannTen left a comment

linux-foundation-easycla bot commented May 8, 2024 •

edited

VannTen commented May 8, 2024 via email

pedro-peter commented May 9, 2024

VannTen commented May 9, 2024

VannTen commented May 17, 2024

pedro-peter commented May 17, 2024

crio container runtime crio_registries path fix #11030

crio container runtime crio_registries path fix #11030

Conversation

pedro-peter commented Mar 23, 2024 • edited

k8s-ci-robot commented Mar 23, 2024

pedro-peter commented Mar 23, 2024

yankay commented Mar 28, 2024

yankay commented Apr 2, 2024

k8s-ci-robot commented Apr 2, 2024

VannTen left a comment

Choose a reason for hiding this comment

linux-foundation-easycla bot commented May 8, 2024 • edited

VannTen commented May 8, 2024 via email

pedro-peter commented May 9, 2024

VannTen commented May 9, 2024

VannTen commented May 17, 2024

pedro-peter commented May 17, 2024

pedro-peter commented Mar 23, 2024 •

edited

linux-foundation-easycla bot commented May 8, 2024 •

edited