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.

Sign up for GitHub

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

Jump to bottom

fix: new artifact streaming containerd configuration and contract #330

Closed
wants to merge 7 commits into from
Closed

fix: new artifact streaming containerd configuration and contract #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55caf86
feat: alpha support for artifact streaming
Bryce-Soghigian Apr 16, 2024
6a6c987
fix: containerd config needs proxy plugins under plugins
Bryce-Soghigian Apr 16, 2024
f331a01
feat: pushing containerd config fix
Bryce-Soghigian Apr 17, 2024
d7e5340
fix: new artifact streaming containerd configuration
Bryce-Soghigian May 7, 2024
6b99af2
fix: removing nodeclass usage of artifact streaming enabling by default
Bryce-Soghigian May 7, 2024
122c81e
Merge branch 'main' into bsoghigian/artifact-streaming-impl
Bryce-Soghigian May 7, 2024
3dfb230
chore: linting
Bryce-Soghigian May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/providers/imagefamily/bootstrap/aksbootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ type NodeBootstrapVariables struct {
KubenetTemplate string // s static
ContainerdConfigContent string // k determined by GPU VM size, WASM support, Kata support
IsKata bool // n user-specified
ArtifactStreamingEnabled bool // t user-specified
}

var (
Expand Down Expand Up @@ -384,7 +385,7 @@ var (
KubenetTemplate: base64.StdEncoding.EncodeToString(kubenetTemplate), // s
ContainerdConfigContent: "", // kd
IsKata: false, // n

ArtifactStreamingEnabled: true, // td
}
)

Expand Down
33 changes: 21 additions & 12 deletions pkg/providers/imagefamily/bootstrap/containerd.toml.gtpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
version = 2
oom_score = 0
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = "mcr.microsoft.com/oss/kubernetes/pause:3.6"
sandbox_image = "mcr.microsoft.com/oss/kubernetes/pause:3.6"
[plugins."io.containerd.grpc.v1.cri".containerd]
{{- if .ArtifactStreamingEnabled }}
snapshotter = "overlaybd"
disable_snapshot_annotations = false
[proxy_plugins]
[proxy_plugins.overlaybd]
type = "snapshot"
address = "/run/overlaybd-snapshotter/overlaybd.sock"
{{- end}}
{{- if .GPUNode }}
default_runtime_name = "nvidia-container-runtime"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia-container-runtime]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia-container-runtime.options]
BinaryName = "/usr/bin/nvidia-container-runtime"
{{- if .NeedsCgroupV2}}
{{- if .NeedsCgroupV2 }}
SystemdCgroup = true
{{- end}}
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted]
Expand All @@ -22,23 +30,24 @@ oom_score = 0
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
BinaryName = "/usr/bin/runc"
{{- if .NeedsCgroupV2}}
{{- if .NeedsCgroupV2 }}
SystemdCgroup = true
{{- end}}
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.untrusted.options]
BinaryName = "/usr/bin/runc"
{{- end}}
{{- if .EnsureNoDupePromiscuousBridge }}
{{- if .EnsureNoDupePromiscuousBridge }}
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "/opt/cni/bin"
conf_dir = "/etc/cni/net.d"
conf_template = "/etc/containerd/kubenet_template.conf"
{{- end}}
[plugins."io.containerd.grpc.v1.cri".registry]
config_path = "/etc/containerd/certs.d"
[plugins."io.containerd.grpc.v1.cri".registry.headers]
X-Meta-Source-Client = ["azure/aks"]
bin_dir = "/opt/cni/bin"
conf_dir = "/etc/cni/net.d"
conf_template = "/etc/containerd/kubenet_template.conf"
{{- end}}
[plugins."io.containerd.grpc.v1.cri".registry]
config_path = "/etc/containerd/certs.d"
[plugins."io.containerd.grpc.v1.cri".registry.headers]
X-Meta-Source-Client = ["azure/aks"]
[metrics]
address = "0.0.0.0:10257"

1 change: 1 addition & 0 deletions pkg/providers/imagefamily/bootstrap/cse_cmd.sh.gtpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ REPO_DEPOT_ENDPOINT="{{.AKSCustomCloudRepoDepotEndpoint}}"
{{.InitAKSCustomCloudFilepath}} >> /var/log/azure/cluster-provision.log 2>&1;
{{end}}
ADMINUSER={{.AdminUsername}}
ARTIFACT_STREAMING_ENABLED={{.ArtifactStreamingEnabled}}
MOBY_VERSION={{.MobyVersion}}
TENANT_ID={{.TenantID}}
KUBERNETES_VERSION={{.KubernetesVersion}}
Expand Down
4 changes: 1 addition & 3 deletions pkg/providers/launchtemplate/parameters/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ type StaticParameters struct {
NetworkPlugin string
NetworkPolicy string
KubernetesVersion string

// VNET
SubnetID string
SubnetID string

Tags map[string]string
Labels map[string]string
Expand Down