Sitelet https://github.com/kubernetes/kops/commit/c8a6b2ae6650a19c866f00c582bb208a25e8c4f4
Skip to content

Commit c8a6b2a

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #18598 from hakman/remove-k8s-1-31
chore: Remove support for Kubernetes 1.31
2 parents c0eb7d9 + df462d0 commit c8a6b2a

90 files changed

Lines changed: 223 additions & 6825 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/kops/create_cluster_integration_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func TestCreateClusterGossipHetzner(t *testing.T) {
6767

6868
// TestCreateClusterMinimal runs kops create cluster minimal.example.com --zones us-test-1a
6969
func TestCreateClusterMinimal(t *testing.T) {
70-
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.31", "v1alpha2")
7170
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.32", "v1alpha2")
7271
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.35", "v1alpha2")
7372
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.36", "v1alpha2")

‎cmd/kops/integration_test.go‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -293,17 +293,6 @@ func TestMinimalAWS(t *testing.T) {
293293
runTestTerraformAWS(t)
294294
}
295295

296-
// TestMinimal runs the test on a minimum configuration
297-
func TestMinimal_v1_31(t *testing.T) {
298-
newIntegrationTest("minimal.example.com", "minimal-1.31").
299-
withAddons(
300-
awsEBSCSIAddon,
301-
dnsControllerAddon,
302-
awsCCMAddon,
303-
).
304-
runTestTerraformAWS(t)
305-
}
306-
307296
// TestMinimal runs the test on a minimum configuration
308297
func TestMinimal_v1_32(t *testing.T) {
309298
newIntegrationTest("minimal.example.com", "minimal-1.32").

‎docs/releases/1.37-NOTES.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
## Release notes for kOps 1.37 series
2+
3+
**⚠ kOps 1.37 has not been released yet! ⚠**
4+
5+
This is a document to gather the release notes prior to the release.
6+
7+
# Significant changes
8+
9+
* TODO
10+
11+
# Other changes of note
12+
13+
* TODO
14+
15+
# Breaking changes
16+
17+
## Other breaking changes
18+
19+
* None at this time
20+
21+
# Known Issues
22+
23+
* None at this time
24+
25+
# Deprecations
26+
27+
* Support for Kubernetes version 1.31 is removed in kOps 1.37.
28+
29+
* Support for Kubernetes version 1.32 is deprecated and will be removed in kOps 1.38.
30+
31+
* Support for containerd versions older than 2.2 (all end of life upstream) is deprecated and will be removed in kOps 1.38.

‎mkdocs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ nav:
172172
- Ports: "contributing/ports.md"
173173
- Cluster Addons & Manager : "contributing/addons.md"
174174
- Releases:
175+
- "1.37": releases/1.37-NOTES.md
175176
- "1.36": releases/1.36-NOTES.md
176177
- "1.35": releases/1.35-NOTES.md
177178
- "1.34": releases/1.34-NOTES.md

‎nodeup/pkg/model/kubelet_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestTaintsApplied(t *testing.T) {
5050
expectTaints []string
5151
}{
5252
{
53-
version: "1.31.0",
53+
version: "1.32.0",
5454
taints: []string{"foo", "bar", "baz"},
5555
expectTaints: []string{"foo", "bar", "baz", "node-role.kubernetes.io/control-plane=:NoSchedule"},
5656
},

‎pkg/assets/assetdata/data_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func TestGetHash(t *testing.T) {
2727
Hash string
2828
}{
2929
{
30-
Name: "https://dl.k8s.io/release/v1.31.0/bin/linux/amd64/kubelet",
31-
Hash: "39e7f1c61c8389ea7680690f8bd5dd733672fa16875ae598df0fd8c205df57a9",
30+
Name: "https://dl.k8s.io/release/v1.32.0/bin/linux/amd64/kubelet",
31+
Hash: "5ad4965598773d56a37a8e8429c3dc3d86b4c5c26d8417ab333ae345c053dae2",
3232
},
3333
{
3434
Name: "https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.amd64",

‎pkg/assets/assetdata/k8s-1.31.yaml‎

Lines changed: 0 additions & 861 deletions
This file was deleted.

‎pkg/model/components/awscloudcontrollermanager.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(cluster *kops.Clu
7474
if eccm.Image == "" {
7575
// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
7676
switch b.ControlPlaneKubernetesVersion().Minor() {
77-
case 31:
78-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.8"
7977
case 32:
8078
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5"
8179
case 33:

‎pkg/model/components/clusterautoscaler.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4343
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
4444
if err == nil {
4545
switch v.Minor {
46-
case 31:
47-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.31.5"
4846
case 32:
4947
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7"
5048
case 33:

‎pkg/model/components/containerd.go‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,13 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4343

4444
containerd := clusterSpec.Containerd
4545

46-
// Set the version based on Kubernetes version
46+
// Set the default version
4747
if fi.ValueOf(containerd.Version) == "" {
48-
switch {
49-
case b.IsKubernetesLT("1.32"):
50-
containerd.Version = new("1.7.32")
51-
containerd.Runc = &kops.Runc{
52-
Version: new("1.3.5"),
53-
}
54-
default:
55-
// Stay on containerd 2.2.x rather than 2.3.x to avoid a sandbox-image
56-
// regression in 2.3 (https://github.com/containerd/containerd/issues/13529).
57-
containerd.Version = new("2.2.4")
58-
containerd.Runc = &kops.Runc{
59-
Version: new("1.3.5"),
60-
}
48+
// Stay on containerd 2.2.x rather than 2.3.x to avoid a sandbox-image
49+
// regression in 2.3 (https://github.com/containerd/containerd/issues/13529).
50+
containerd.Version = new("2.2.4")
51+
containerd.Runc = &kops.Runc{
52+
Version: new("1.3.5"),
6153
}
6254
}
6355
// Set the default log level to INFO

0 commit comments

Comments
 (0)