diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go index 024355f049f0b..c598ce79bfdf9 100644 --- a/nodeup/pkg/model/ntp.go +++ b/nodeup/pkg/model/ntp.go @@ -65,7 +65,7 @@ func (b *NTPBuilder) Build(c *fi.NodeupModelBuilderContext) error { } c.AddTask((&nodetasks.Service{Name: "systemd-timesyncd"}).InitDefaults()) } else if b.Distribution.IsDebianFamily() { - c.AddTask(&nodetasks.Package{Name: "chrony"}) + //c.AddTask(&nodetasks.Package{Name: "chrony"}) if ntpHost != "" { c.AddTask(b.buildChronydConf("/etc/chrony/chrony.conf", ntpHost)) } diff --git a/nodeup/pkg/model/packages.go b/nodeup/pkg/model/packages.go index 12d1782ca1d2b..a94b032a05553 100644 --- a/nodeup/pkg/model/packages.go +++ b/nodeup/pkg/model/packages.go @@ -36,16 +36,16 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error { // kubelet needs: // conntrack - kops #5671 if b.Distribution.IsDebianFamily() { - // From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_ubuntu.yaml - c.AddTask(&nodetasks.Package{Name: "bridge-utils"}) - c.AddTask(&nodetasks.Package{Name: "conntrack"}) - c.AddTask(&nodetasks.Package{Name: "iptables"}) - c.AddTask(&nodetasks.Package{Name: "libapparmor1"}) - c.AddTask(&nodetasks.Package{Name: "libseccomp2"}) - if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" { - c.AddTask(&nodetasks.Package{Name: "nftables"}) - } - c.AddTask(&nodetasks.Package{Name: "util-linux"}) + //// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_ubuntu.yaml + //c.AddTask(&nodetasks.Package{Name: "bridge-utils"}) + //c.AddTask(&nodetasks.Package{Name: "conntrack"}) + //c.AddTask(&nodetasks.Package{Name: "iptables"}) + //c.AddTask(&nodetasks.Package{Name: "libapparmor1"}) + //c.AddTask(&nodetasks.Package{Name: "libseccomp2"}) + //if b.NodeupConfig.KubeProxy != nil && fi.ValueOf(b.NodeupConfig.KubeProxy.Enabled) && b.NodeupConfig.KubeProxy.ProxyMode == "nftables" { + // c.AddTask(&nodetasks.Package{Name: "nftables"}) + //} + //c.AddTask(&nodetasks.Package{Name: "util-linux"}) // Additional packages for _, additionalPackage := range b.NodeupConfig.Packages { c.EnsureTask(&nodetasks.Package{Name: additionalPackage}) diff --git a/tests/e2e/scenarios/karpenter/run-test.sh b/tests/e2e/scenarios/karpenter/run-test.sh index 83fdc342957ed..64b805d5059f5 100755 --- a/tests/e2e/scenarios/karpenter/run-test.sh +++ b/tests/e2e/scenarios/karpenter/run-test.sh @@ -40,7 +40,7 @@ metadata: spec: amiFamily: Custom amiSelectorTerms: - - ssmParameter: /aws/service/canonical/ubuntu/server/24.04/stable/current/arm64/hvm/ebs-gp3/ami-id + - ssmParameter: /aws/service/canonical/ubuntu/server/25.10/stable/current/arm64/hvm/ebs-gp3/ami-id associatePublicIPAddress: true tags: KubernetesCluster: ${CLUSTER_NAME} @@ -59,13 +59,13 @@ spec: YAML # Create a NodePool for Karpenter -# Effectively disable consolidation for 30 minutes to avoid flakes in the tests kubectl apply -f - <