diff --git a/slides/k8s/cluster-upgrade.md b/slides/k8s/cluster-upgrade.md index 5672f814..5738e903 100644 --- a/slides/k8s/cluster-upgrade.md +++ b/slides/k8s/cluster-upgrade.md @@ -111,34 +111,6 @@ --- -## General guidelines - -- To update a component, use whatever was used to install it - -- If it's a distro package, update that distro package - -- If it's a container or pod, update that container or pod - -- If you used configuration management, update with that - ---- - -## Know where your binaries come from - -- Sometimes, we need to upgrade *quickly* - - (when a vulnerability is announced and patched) - -- If we are using an installer, we should: - - - make sure it's using upstream packages - - - or make sure that whatever packages it uses are current - - - make sure we can tell it to pin specific component versions - ---- - ## Important questions - Should we upgrade the control plane before or after the kubelets? @@ -206,6 +178,34 @@ and kubectl, which can be one MINOR ahead or behind API server.] --- +## General guidelines + +- To update a component, use whatever was used to install it + +- If it's a distro package, update that distro package + +- If it's a container or pod, update that container or pod + +- If you used configuration management, update with that + +--- + +## Know where your binaries come from + +- Sometimes, we need to upgrade *quickly* + + (when a vulnerability is announced and patched) + +- If we are using an installer, we should: + + - make sure it's using upstream packages + + - or make sure that whatever packages it uses are current + + - make sure we can tell it to pin specific component versions + +--- + ## In practice - We are going to update a few cluster components diff --git a/slides/k8s/pod-security-intro.md b/slides/k8s/pod-security-intro.md index 1fa4fc4b..034ad716 100644 --- a/slides/k8s/pod-security-intro.md +++ b/slides/k8s/pod-security-intro.md @@ -114,7 +114,7 @@ - plugins (compiled in API server; enabled/disabled by reconfiguration) - - webhooks (registesred dynamically) + - webhooks (registered dynamically) - Admission control has many other uses