Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

add default kubernetes configuration #1944

Merged
merged 4 commits into from
Jun 16, 2022
Merged

add default kubernetes configuration #1944

merged 4 commits into from
Jun 16, 2022

Conversation

tormath1
Copy link
Contributor

@tormath1 tormath1 commented Jun 8, 2022

While working on kubernetes-1.24 test in flatcar/mantle#337, we found that containerd and some modules need to be enabled for satisfying kubeadm pre-flight checks with the removal of Dockershim.

This is also mentioned in the documentation: https://kubernetes.io/docs/setup/production-environment/container-runtimes/#forwarding-ipv4-and-letting-iptables-see-bridged-traffic

Initially br_netfilter was loaded by Docker directly.


Note for reviewers

I'm not sure about backporting this change across the channels as we have workaround (enabling containerd + loading required modules with kernel arguments for example) - but maybe it's worth to call it out in the next release notes.

@tormath1 tormath1 self-assigned this Jun 8, 2022
@tormath1 tormath1 added the main label Jun 9, 2022
@tormath1 tormath1 marked this pull request as ready for review June 16, 2022 12:03
@tormath1 tormath1 requested a review from a team June 16, 2022 12:03
Copy link
Contributor

@dongsupark dongsupark left a comment

Choose a reason for hiding this comment

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

Looks good, but needs a rebase.

this pulls kubernetes module configuration.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
`docker.service` has a dependency to `containerd.service`:
```
$ systemctl list-dependencies docker.service
docker.service
  containerd.service
  ...
```

If `docker.service` is not started (explicitly or via socket activation)
`containerd.service` won't start.

To ensure a seamless transition to kubernetes-1.24 let's enable by
default `containerd.service`.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This is now handled in `flatcar-linux/init` repo in the `modules-load.d`
config directory.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@tormath1 tormath1 merged commit f51464c into main Jun 16, 2022
@tormath1 tormath1 deleted the tormath1/k-124 branch June 16, 2022 15:54
tormath1 added a commit to flatcar/mantle that referenced this pull request Jun 17, 2022
this requires some changes introduced in: flatcar-archive/coreos-overlay#1944

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
tormath1 added a commit to flatcar/mantle that referenced this pull request Jun 23, 2022
this requires some changes introduced in: flatcar-archive/coreos-overlay#1944

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
tormath1 added a commit to flatcar/mantle that referenced this pull request Jun 23, 2022
this requires some changes introduced in: flatcar-archive/coreos-overlay#1944

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@pothos
Copy link
Contributor

pothos commented Jun 30, 2022

Should we backport this to all channels including LTS? I anyway have to do an init backport in flatcar/init#75 and need to create a backport branch for the Beta and we could backport flatcar/init#72 and this PR with the modification of using the backport branches.

@tormath1
Copy link
Contributor Author

@pothos this change should be harmless I'm fine with backporting it.

pothos added a commit that referenced this pull request Jun 30, 2022
add default kubernetes configuration
@pothos
Copy link
Contributor

pothos commented Jun 30, 2022

Doing it now for 3227, 3139, 3033 because it is required for K8s 1.24 to work as expected

pothos added a commit that referenced this pull request Jun 30, 2022
add default kubernetes configuration
pothos added a commit that referenced this pull request Jun 30, 2022
add default kubernetes configuration
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants