Skip to content

chore: deprecate acr teleport #8052

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

Open
calvin197 wants to merge 12 commits into
base: main
Choose a base branch
from
+634 −1,631
Open

chore: deprecate acr teleport #8052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b188a33
Delete teleportd service file and teleport proto files
calvin197 Mar 10, 2026
871535c
Remove teleport from CSE shell scripts
calvin197 Mar 10, 2026
4076035
Remove teleport from cloud-init and Go data model
calvin197 Mar 10, 2026
fa786a8
Remove teleport from containerd config templates and template function
calvin197 Mar 10, 2026
d7461dd
Remove teleport test cases
calvin197 Mar 10, 2026
35784e6
Remove teleport from aks-node-controller parser
calvin197 Mar 10, 2026
a1c15f4
Remove teleport from Packer VHD build configs
calvin197 Mar 10, 2026
dd29f0b
Regenerate snapshot test data and proto files
calvin197 Mar 10, 2026
56e9c74
fix format
calvin197 Mar 10, 2026
28d3593
make generate
calvin197 Mar 10, 2026
15cee57
Merge branch 'main' into calvinshum/deprecate-teleport
calvin197 Mar 10, 2026
4d21bb3
Merge branch 'main' into calvinshum/deprecate-teleport
calvin197 Mar 11, 2026
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
Prev Previous commit
Next Next commit
Remove teleport test cases 
Remove the AKSUbuntu2404+Teleport test entry from baker_test.go and
its associated testdata directory. Delete the AKSUbuntu1804+Containerd+
Teleport testdata directory. Remove teleportd constants from the
removeComments test data in utils_test.go.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
  • Loading branch information
@calvin197 @claude
calvin197 and claude committed Mar 10, 2026
commit d7461ddd300bcaf4c1f3c0f7940f0535a23230b5
60 changes: 0 additions & 60 deletions pkg/agent/baker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,66 +1807,6 @@ oom_score = -999
Expect(containerdUlimitContent).NotTo(ContainSubstring("LimitNOFILE=1048"))
Expect(containerdUlimitContent).To(ContainSubstring("LimitMEMLOCK=75000"))
}),
Entry("AKSUbuntu2404 containerd v2 CRI plugin config should have rename containerd runtime name", "AKSUbuntu2404+Teleport", ">=1.32.x",
func(config *datamodel.NodeBootstrappingConfiguration) {
config.ContainerService.Properties.AgentPoolProfiles[0].KubernetesConfig = &datamodel.KubernetesConfig{
ContainerRuntime: datamodel.Containerd,
}
config.ContainerService.Properties.AgentPoolProfiles[0].Distro = datamodel.AKSUbuntuContainerd2404
config.ContainerService.Properties.OrchestratorProfile.OrchestratorVersion = "1.32.0"
// to have snapshotter features
config.EnableACRTeleportPlugin = true
}, func(o *nodeBootstrappingOutput) {
containerdConfigFileContent, err := getBase64DecodedValue([]byte(o.vars["CONTAINERD_CONFIG_CONTENT"]))
Expect(err).To(BeNil())
expectedContainerdV2CriConfig := `
[plugins."io.containerd.cri.v1.images".pinned_images]
sandbox = ""
`
deprecatedContainerdV1CriConfig := `
[plugins."io.containerd.grpc.v1.cri"]
sandbox_image = ""
`
Expect(containerdConfigFileContent).To(ContainSubstring(expectedContainerdV2CriConfig))
Expect(containerdConfigFileContent).NotTo(ContainSubstring(deprecatedContainerdV1CriConfig))

expectedSnapshotterConfig := `
[plugins."io.containerd.cri.v1.images"]
snapshotter = "teleportd"
disable_snapshot_annotations = false
`
deprecatedSnapshotterConfig := `
[plugins."io.containerd.grpc.v1.cri".containerd]
snapshotter = "teleportd"
disable_snapshot_annotations = false
`
Expect(expectedSnapshotterConfig).NotTo(Equal(deprecatedSnapshotterConfig))
Expect(containerdConfigFileContent).To(ContainSubstring(expectedSnapshotterConfig))
Expect(containerdConfigFileContent).NotTo(ContainSubstring(deprecatedSnapshotterConfig))

expectedRuncConfig := `
[plugins."io.containerd.cri.v1.runtime".containerd]
default_runtime_name = "runc"
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc.options]
BinaryName = "/usr/bin/runc"
SystemdCgroup = true
`
deprecatedRuncConfig := `
[plugins."io.containerd.grpc.v1.cri".containerd]
default_runtime_name = "runc"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
BinaryName = "/usr/bin/runc"
SystemdCgroup = true
`
Expect(expectedRuncConfig).NotTo(Equal(deprecatedRuncConfig))
Expect(containerdConfigFileContent).To(ContainSubstring(expectedRuncConfig))
Expect(containerdConfigFileContent).NotTo(ContainSubstring(deprecatedRuncConfig))

}),
Entry("AKSUbuntu2404 containerd v2 CRI plugin config should not have deprecated cni features", "AKSUbuntu2404+NetworkPolicy", ">=1.32.x",
func(config *datamodel.NodeBootstrappingConfiguration) {
config.ContainerService.Properties.AgentPoolProfiles[0].KubernetesConfig = &datamodel.KubernetesConfig{
Expand Down
Loading