Skip to content

WIP Experiment with apt packages installation #17669

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+103 −29
Draft

WIP Experiment with apt packages installation #17669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion nodeup/pkg/model/ntp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
20 changes: 10 additions & 10 deletions nodeup/pkg/model/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
90 changes: 83 additions & 7 deletions tests/e2e/scenarios/karpenter/run-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 - <<YAML
apiVersion: karpenter.sh/v1
kind: NodePool
metadata:
name: default
spec:
replicas: 1
template:
spec:
requirements:
Expand All @@ -79,14 +79,90 @@ spec:
group: karpenter.k8s.aws
kind: EC2NodeClass
name: default
replicas: 4
disruption:
consolidationPolicy: WhenEmpty
consolidateAfter: 30m
YAML
# Wait for the nodes to start being provisioned
sleep 10
# Wait for the nodes to be ready
"${KOPS}" validate cluster --wait=10m

# Increase NodePool for Karpenter
kubectl apply -f - <<YAML
apiVersion: karpenter.sh/v1
kind: NodePool
metadata:
name: default
spec:
replicas: 2
template:
spec:
requirements:
- key: node.kubernetes.io/instance-type
operator: In
values: ["m6g.large"]
- key: karpenter.sh/capacity-type
operator: In
values: ["on-demand"]
nodeClassRef:
group: karpenter.k8s.aws
kind: EC2NodeClass
name: default
YAML
# Wait for the nodes to start being provisioned
sleep 10
# Wait for the nodes to be ready
"${KOPS}" validate cluster --wait=10m

# Increase NodePool for Karpenter
kubectl apply -f - <<YAML
apiVersion: karpenter.sh/v1
kind: NodePool
metadata:
name: default
spec:
replicas: 3
template:
spec:
requirements:
- key: node.kubernetes.io/instance-type
operator: In
values: ["m6g.large"]
- key: karpenter.sh/capacity-type
operator: In
values: ["on-demand"]
nodeClassRef:
group: karpenter.k8s.aws
kind: EC2NodeClass
name: default
YAML
# Wait for the nodes to start being provisioned
sleep 10
# Wait for the nodes to be ready
"${KOPS}" validate cluster --wait=10m

# Increase NodePool for Karpenter
kubectl apply -f - <<YAML
apiVersion: karpenter.sh/v1
kind: NodePool
metadata:
name: default
spec:
replicas: 4
template:
spec:
requirements:
- key: node.kubernetes.io/instance-type
operator: In
values: ["m6g.large"]
- key: karpenter.sh/capacity-type
operator: In
values: ["on-demand"]
nodeClassRef:
group: karpenter.k8s.aws
kind: EC2NodeClass
name: default
YAML
# Wait for the nodes to start being provisioned
sleep 30
sleep 10
# Wait for the nodes to be ready
"${KOPS}" validate cluster --wait=10m

Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/nodeup/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
loader.Builders = append(loader.Builders, &model.EtcHostsBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.NTPBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.DirectoryBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.UpdateServiceBuilder{NodeupModelContext: modelContext})
//loader.Builders = append(loader.Builders, &model.UpdateServiceBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.VolumesBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.ContainerdBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.ProtokubeBuilder{NodeupModelContext: modelContext})
Expand All @@ -304,7 +304,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
loader.Builders = append(loader.Builders, &model.HookBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.KubeletBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.KubectlBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.LogrotateBuilder{NodeupModelContext: modelContext})
//loader.Builders = append(loader.Builders, &model.LogrotateBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.ManifestsBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.PackagesBuilder{NodeupModelContext: modelContext})
loader.Builders = append(loader.Builders, &model.NvidiaBuilder{NodeupModelContext: modelContext})
Expand Down
16 changes: 7 additions & 9 deletions upup/pkg/fi/nodeup/nodetasks/update_packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ package nodetasks
import (
"fmt"
"os"
"os/exec"
"syscall"

"k8s.io/klog/v2"
"k8s.io/kops/upup/pkg/fi"
Expand Down Expand Up @@ -83,13 +81,13 @@ func (_ *UpdatePackages) RenderLocal(t *local.LocalTarget, a, e, changes *Update
} else {
return fmt.Errorf("unsupported package system")
}
klog.Infof("running command %s", args)
cmd := exec.Command(args[0], args[1:]...)
output, err := cmd.CombinedOutput()
// 'yum check-update' exits with 100 if it finds updates; treat it like a success
if exitCode := cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus(); err != nil && exitCode != 100 {
return fmt.Errorf("error update packages: %v: %s", err, string(output))
}
klog.Infof("NOT running command %s", args)
//cmd := exec.Command(args[0], args[1:]...)
//output, err := cmd.CombinedOutput()
//// 'yum check-update' exits with 100 if it finds updates; treat it like a success
//if exitCode := cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus(); err != nil && exitCode != 100 {
// return fmt.Errorf("error update packages: %v: %s", err, string(output))
//}

return nil
}
Loading