Fix containerd and CNI install #432
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
ArangoGutierrez
requested review from
cdesiniotis,
elezar and
tariq1890
as code owners
Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>
There was a problem hiding this comment.
Pull Request Overview
This PR fixes containerd and CNI installation by unifying the containerd configuration to use version 2 for all versions, updating the default version to 1.7.28, and improving error handling during provisioning failures.
- Unified containerd configuration to use version 2 for both 1.x and 2.x versions
- Updated default containerd version from 1.7.26 to 1.7.28
- Added interactive cleanup options for failed provisioning attempts
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| pkg/provisioner/templates/kubernetes.go | Added Ubuntu-specific resolv.conf configuration and cgroup driver settings |
| pkg/provisioner/templates/containerd.go | Updated default version and unified configuration approach |
| pkg/provisioner/templates/containerd_test.go | Updated tests to reflect new unified configuration |
| pkg/provisioner/templates/container-toolkit.go | Added CNI configuration verification after nvidia-ctk |
| cmd/cli/create/create.go | Added interactive cleanup handling for provisioning failures |
| cmd/cli/main.go | Fixed delete command example syntax |
| Multiple test files | Added copyright headers |
| PodSubnet: "192.168.0.0/16", // Default subnet, modify if needed | ||
| FeatureGates: featureGates, // Convert slice to string for kubeadm | ||
| RuntimeConfig: "resource.k8s.io/v1beta1=true", // Example runtime config | ||
| IsUbuntu: true, // Default to true for Ubuntu-based deployments |
There was a problem hiding this comment.
Hardcoding IsUbuntu to true by default may cause issues on non-Ubuntu systems. Consider determining the OS type dynamically or making this configurable through the environment specification.
Suggested change
| IsUbuntu: true, // Default to true for Ubuntu-based deployments | |
| IsUbuntu: isUbuntu(), // Dynamically determine if the system is Ubuntu-based |
Comment on lines
227
to
+234
| address = "/run/containerd/containerd.sock" | ||
| uid = 0 | ||
| gid = 0 | ||
| [plugins] | ||
| [plugins."io.containerd.grpc.v1.cri"] | ||
| sandbox_image = "registry.k8s.io/pause:3.9" | ||
| systemd_cgroup = true | ||
| [plugins."io.containerd.grpc.v1.cri".containerd] | ||
| [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] | ||
| [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] | ||
| runtime_type = "io.containerd.runtime.v1.linux" | ||
| [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] | ||
| SystemdCgroup = true | ||
| [plugins."io.containerd.grpc.v1.cri".registry] | ||
| [plugins."io.containerd.grpc.v1.cri".registry.mirrors] | ||
| [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] | ||
| endpoint = ["https://registry-1.docker.io"] | ||
| EOF | ||
| fi | ||
| # Ensure CNI directories exist | ||
| sudo mkdir -p /etc/cni/net.d | ||
| sudo mkdir -p /opt/cni/bin | ||
| # Ensure containerd directories exist |
There was a problem hiding this comment.
The unified configuration removes version-specific handling but still uses hardcoded paths. Consider adding validation that these paths are appropriate for the target system, especially since the comment mentions 'distro variance'.
| if ! sudo grep -q 'bin_dir = "/opt/cni/bin:/usr/libexec/cni"' /etc/containerd/config.toml; then | ||
| echo "WARNING: CNI bin_dir configuration may have been modified by nvidia-ctk" | ||
| echo "Restoring CNI paths..." | ||
| # This is a safeguard, but nvidia-ctk should preserve existing CNI config |
There was a problem hiding this comment.
The sed command on line 51 is complex and error-prone. Consider using a more robust configuration management approach or validating that the sed pattern correctly targets only the intended configuration section.
Pull Request Test Coverage Report for Build 16624739979Details
💛 - Coveralls |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.