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.

Sign up for GitHub

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

Jump to bottom

Fix containerd (<1.7) configuration for insecure registries #9207

Merged
merged 1 commit into from
Aug 23, 2022
Merged

Fix containerd (<1.7) configuration for insecure registries #9207

merged 1 commit into from
Aug 23, 2022

Conversation

pbchekin
Copy link
Contributor

For the following configuration

    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com

the rendered /etc/containerd/config.toml contains

        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true

but it needs to be

        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fixes /etc/containerd/config.toml generation for insecure registries.

Which issue(s) this PR fixes:

Fixes #9192

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@pbchekin
Fix containerd (<1.7) configuration for insecure registries
b7bd4fc 
For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Aug 22, 2022
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Aug 22, 2022 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: pbchekin / name: Pavel Chekin (b7bd4fc)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Aug 22, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @pbchekin!

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 @pbchekin. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 22, 2022
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Aug 22, 2022
@cristicalin
Copy link
Contributor

Thank you doe this contribution @pbchekin

/approve
/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 Aug 23, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, pbchekin

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 Aug 23, 2022
@yankay
Copy link
Member

yankay commented Aug 23, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 23, 2022
@k8s-ci-robot k8s-ci-robot merged commit 8f899a1 into kubernetes-sigs:master Aug 23, 2022
pbchekin added a commit to pbchekin/kubespray that referenced this pull request Aug 23, 2022
@pbchekin
Fix containerd (<1.7) configuration for insecure registries (kubernet…
d557d90 
…es-sigs#9207)

For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
TinLe added a commit to TinLe/kubespray that referenced this pull request Aug 27, 2022
@TinLe
Merge remote-tracking branch 'upstream/master'
3fa0d59 
* upstream/master: (832 commits)
  add pre-commit hook to facilitate local testing (kubernetes-sigs#9158)
  cri-dockerd: add restart of docker.service (kubernetes-sigs#9205)
  do not run etcd role in scale.yml playbook when etcd installed by kubeadm (kubernetes-sigs#9210)
  optimize the format of evictionHard in kubelet-config.yaml template (kubernetes-sigs#9204)
  Update vars.md (kubernetes-sigs#9172)
  fix one bug in docs/nodes (kubernetes-sigs#9203)
  Fix containerd (<1.7) configuration for insecure registries (kubernetes-sigs#9207)
  🌱 Enable cri-dockerd service (kubernetes-sigs#9201)
  Update vsphere-csi.md (kubernetes-sigs#9170)
  9035: Make Cilium rolling-restart delay/timeout configurable (kubernetes-sigs#9176)
  [kubernetes] Add hashes for 1.24.4, 1.22.13, 1.23.10 and make v1.24.4 default (kubernetes-sigs#9191)
  Add 'avoid-buggy-ips' support of MetalLB (kubernetes-sigs#9166)
  Add the option to enable default Pod Security Configuration (kubernetes-sigs#9017)
  Add 'flush ip6tables' task in reset role (kubernetes-sigs#9168)
  add list nodes rules to cilium-operator clusterrole (kubernetes-sigs#9178)
  docs(kube-vip): fix broken links (kubernetes-sigs#9165)
  Disable DNSStubListener for Flatcar Linux (kubernetes-sigs#9160)
  Subnet setup order fix & Number of master nodes syntax fix (kubernetes-sigs#9159)
  Fix CSI drivers issues on Azure (kubernetes-sigs#9153)
  [calico] calico rr supports multiple groups (kubernetes-sigs#9134)
  ...
alegrey91 pushed a commit to alegrey91/kubespray that referenced this pull request Aug 29, 2022
@pbchekin @alegrey91
Fix containerd (<1.7) configuration for insecure registries (kubernet…
7bdfbd5 
…es-sigs#9207)

For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
@foxracle foxracle mentioned this pull request Oct 11, 2022
Closed
This was referenced Jan 10, 2023
Closed
Closed
Closed
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
@pbchekin @nolimitkun
Fix containerd (<1.7) configuration for insecure registries (kubernet…
4913d7b 
…es-sigs#9207)

For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jul 7, 2023
@pbchekin @LuckySB
Fix containerd (<1.7) configuration for insecure registries (kubernet…
717697c 
…es-sigs#9207)

For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
sw-cho pushed a commit to sw-cho/kubespray that referenced this pull request Feb 5, 2024
@pbchekin
Fix containerd (<1.7) configuration for insecure registries (kubernet…
7c9f77c 
…es-sigs#9207)

For the following configuration

```
    containerd_insecure_registries:
      docker.io:
        - dockerhubcache.example.com
```

the rendered /etc/containerd/config.toml contains

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls]
          insecure_skip_verify = true
```

but it needs to be

```
        [plugins."io.containerd.grpc.v1.cri".registry.configs."dockerhubcache.example.com".tls]
          insecure_skip_verify = true
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cristicalin cristicalin Awaiting requested review from cristicalin

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@yankay yankay

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/bug Categorizes issue or PR as related to a bug. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update rendering containerd config.toml to support insecure registries
4 participants
@pbchekin @k8s-ci-robot @cristicalin @yankay