Files

David Porter 3281504a50 cluster/ - Configure containerd only if necessary

PR #107663 changed the startup logic to always call `SetupContainerd`
which will generate a new containerd `/etc/containerd/config.toml` file.

This is not always desired since some jobs install containerd from
source and the containerd startup scripts
(https://github.com/containerd/containerd/blob/main/contrib/gce/configure.sh)
are responsible for generating the `/etc/containerd/config.toml` file.
By always calling `SetupContainerd`, the containerd configuration by
containerd's `configure.sh` will be overridden which breaks certain test
jobs, see https://github.com/kubernetes/kubernetes/issues/107830.

To fix this issue, only call `SetupContainerd` if
`/etc/profile.d/containerd_env.sh` does not exist. When containerd
`configure.sh` script will run, `/etc/profile.d/containerd_env.sh` will
be written, and as a result the k8s setup scripts should avoid
overriding the containerd configuration.

Signed-off-by: David Porter <david@porter.me>

2022-02-10 14:24:14 -08:00

addons

Merge pull request #107481 from shu-mutou/deprecate-dashboard-addon

2022-02-10 05:35:48 -08:00

gce

cluster/ - Configure containerd only if necessary

2022-02-10 14:24:14 -08:00

images

fix not return when channel closed

2022-01-14 10:47:01 +08:00

kubemark

Check in OWNERS modified by update-yamlfmt.sh