Merge pull request #17694 from hakman/drop-more-packages

Drop bridge-utils and conntrack packages

Author: k8s-ci-robot

docs/releases/1.35-NOTES.md

@@ -0,0 +1,41 @@
+## Release notes for kOps 1.35 series
+
+**⚠ kOps 1.35 has not been released yet! ⚠**
+
+This is a document to gather the release notes prior to the release.
+
+# Significant changes
+
+* `bridge-utils`, `conntrack`, `pigz`, `libltdl` are no longer installed by default.
+
+## Some Feature
+
+* TODO
+
+## AWS
+
+## GCP
+
+* TODO
+
+## Openstack
+
+* TODO
+
+# Other changes of note
+
+* TODO
+
+# Breaking changes
+
+## Other breaking changes
+
+# Known Issues
+
+* TODO
+
+# Deprecations
+
+* Support for Kubernetes version 1.29 is removed in kOps 1.35.
+
+* Support for Kubernetes version 1.30 is deprecated and will be removed in kOps 1.36.

nodeup/pkg/model/packages.go

@@ -36,9 +36,6 @@ 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"})
@@ -51,8 +48,6 @@ func (b *PackagesBuilder) Build(c *fi.NodeupModelBuilderContext) error {
 			c.EnsureTask(&nodetasks.Package{Name: additionalPackage})
 		}
 	} else if b.Distribution.IsRHELFamily() {
-		// From containerd: https://github.com/containerd/cri/blob/master/contrib/ansible/tasks/bootstrap_centos.yaml
-		c.AddTask(&nodetasks.Package{Name: "conntrack-tools"})
 		if b.Distribution == distributions.DistributionAmazonLinux2023 {
 			// install iptables-nft in al2023 (NOT the iptables-legacy!)
 			c.AddTask(&nodetasks.Package{Name: "iptables-nft"})