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

Kube 1.21.1 cherry-picks for release-1.21 #909

Merged
merged 18 commits into from
May 20, 2021

Conversation

ncopa
Copy link
Collaborator

@ncopa ncopa commented May 19, 2021

Cherry-picks for release-1.21 branch.

should be basicallyeverythin in our current main.

@ncopa ncopa requested a review from a team as a code owner May 19, 2021 14:57
@ncopa ncopa requested review from jasmingacic and mviitane and removed request for a team May 19, 2021 14:57
Mikhail Sakhnov and others added 16 commits May 19, 2021 21:19
Signed-off-by: Mikhail Sakhnov <msakhnov@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Mikhail Sakhnov <msakhnov@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
…I time dependencies to keep root go.mod and go.sum clean

Signed-off-by: Mikhail Sakhnov <msakhnov@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Mikhail Sakhnov <msakhnov@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Mikhail Sakhnov <msakhnov@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
* Add k0s start and stop for controlling service state

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Wrong pkg

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Add some documentation

* Add controller+worker to InstalledService

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

* Suppress usage

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

* Ignore svc.Status() error

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

* More ignoring

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

* Makes more sense now

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>

Co-authored-by: Kimmo Lehto <klehto@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Shane Jarych <sjarych@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
* Twriter edits to k0s Architecture content.

Signed-off-by: KoryKessel-Docker <kory.kessel@docker.com>

* Address of first wave of review comments.

Signed-off-by: KoryKessel-Mirantis <kkessel@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Jasmin Gacic <jasmin.gacic@gmail.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
- runc 1.0.0-rc94
- containerd 1.4.5
- etcd 3.4.16

Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
The kube proxy image version should match the kubernetes version we
embed.

Test also the Kubernetes MajorMinorVersion

Signed-off-by: Natanael Copa <ncopa@mirantis.com>
should match the kubernetes version

fixes k0sproject#907

Signed-off-by: Natanael Copa <ncopa@mirantis.com>
For details see:
GHSA-c3xm-pvg7-gh7r

Signed-off-by: Natanael Copa <ncopa@mirantis.com>
Signed-off-by: Natanael Copa <ncopa@mirantis.com>
@ncopa
Copy link
Collaborator Author

ncopa commented May 19, 2021

@jnummelin
Copy link
Collaborator

I think we need to add also #912 once that gets merged

…o find ready pods from

Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
Copy link
Collaborator

@jnummelin jnummelin left a comment

Choose a reason for hiding this comment

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

LGTM

@ncopa ncopa merged commit c80fabd into k0sproject:release-1.21 May 20, 2021
@ncopa ncopa deleted the kube-1.21.1 branch May 20, 2021 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants