Adds configurable containerd base dir during bootstrap / join #817
+138
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
claudiubelu
changed the title
claudiubelu
commented
Nov 20, 2024
src/k8s/go.mod
Outdated
| @@ -177,3 +177,5 @@ require ( | |||
| sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect | |||
| sigs.k8s.io/yaml v1.4.0 // indirect | |||
| ) | |||
|
|
|||
| replace github.com/canonical/k8s-snap-api v1.0.13 => github.com/claudiubelu/k8s-snap-api v0.0.0-20241119131040-dc75989e4d14 | |||
There was a problem hiding this comment.
NOTE: this change and the go.sum one is only for testing purposes.
Comment on lines
40
to
44
| if req.ContainerdBaseDir != "" { | ||
| e.provider.Snap().SetContainerdBaseDir(req.ContainerdBaseDir) | ||
| } |
There was a problem hiding this comment.
I would rather see this in ClusterConfig's SetDefaults().
bschimke95
requested changes
Nov 20, 2024
claudiubelu
force-pushed
the
KU-2155/configure-containerd-base-dir
branch
6 times, most recently
from
60e1613
to
ba46ef5
Compare
Currently, for the classic k8s snap, the default locations for the containerd-related files are: - /etc/containerd/ - /run/containerd/ - /var/lib/containerd/ These paths can conflict with other containerd installations on the host (e.g. from docker), meaning that the k8s snap cannot be installed. In a developer's usecase, we shouldn't require the other services to be disabled, but we can allow the k8s snap's containerd to be installed in a different location during bootstrap / node join. Adds the --containerd-base-dir option for k8s bootstrap and join-cluster commands. If not given, the snap's default paths will be used instead. After the node was initialized, save the containerd base location in a file, so we can properly reference it later / on restart.
claudiubelu
force-pushed
the
KU-2155/configure-containerd-base-dir
branch
from
ba46ef5
to
a862186
Compare
|
Instead of creating a new feature, can this be set by the ExtraContainerdArgs bootstrap option we already have? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds configurable containerd base dir during bootstrap / join
Currently, for the classic k8s snap, the default locations for the containerd-related files are:
These paths can conflict with other containerd installations on the host (e.g. from docker), meaning that the k8s snap cannot be installed. In a developer's usecase, we shouldn't require the other services to be disabled, but we can allow the k8s snap's containerd to be installed in a different location during bootstrap / node join.
Adds the
--containerd-base-diroption for k8s bootstrap and join-cluster commands. If not given, the snap's default paths will be used instead. After the node was initialized, save the containerd base location in a file, so we can properly reference it later / on restart.Depends-On: canonical/k8s-snap-api#19