From 6d3d69c4ec3369266c9ec7e68f1b66bb8329a4e8 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Thu, 26 Dec 2024 15:04:23 -0800 Subject: [PATCH 1/3] Add end of standard support dates for all kubernetes versions above 1.28 --- EKSD_LATEST_RELEASES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES index 6484934496..4223d7fc68 100644 --- a/EKSD_LATEST_RELEASES +++ b/EKSD_LATEST_RELEASES @@ -33,12 +33,16 @@ releases: - branch: 1-28 kubeVersion: v1.28.15 number: 38 + endOfStandardSupport: 12/31/2024 - branch: 1-29 kubeVersion: v1.29.11 number: 27 + endOfStandardSupport: 04/30/2025 - branch: 1-30 kubeVersion: v1.30.7 number: 20 + endOfStandardSupport: 08/31/2025 - branch: 1-31 kubeVersion: v1.31.3 number: 9 + endOfStandardSupport: 12/31/2025 From 6e12f28592a1a713d57f974a8176a28c1180cd54 Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Mon, 30 Dec 2024 12:22:00 -0800 Subject: [PATCH 2/3] Update the date values to use the unambiguous date format as a string --- EKSD_LATEST_RELEASES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES index 4223d7fc68..857339dfe7 100644 --- a/EKSD_LATEST_RELEASES +++ b/EKSD_LATEST_RELEASES @@ -33,16 +33,16 @@ releases: - branch: 1-28 kubeVersion: v1.28.15 number: 38 - endOfStandardSupport: 12/31/2024 + endOfStandardSupport: "2024-12-31" - branch: 1-29 kubeVersion: v1.29.11 number: 27 - endOfStandardSupport: 04/30/2025 + endOfStandardSupport: "2025-04-30" - branch: 1-30 kubeVersion: v1.30.7 number: 20 - endOfStandardSupport: 08/31/2025 + endOfStandardSupport: "2025-08-31" - branch: 1-31 kubeVersion: v1.31.3 number: 9 - endOfStandardSupport: 12/31/2025 + endOfStandardSupport: "2025-12-31" From 1aac6026c60677477bd0e94f99122dab28b1a71e Mon Sep 17 00:00:00 2001 From: Saurabh Parekh Date: Mon, 30 Dec 2024 19:08:58 -0800 Subject: [PATCH 3/3] Update the project upgrader tool to include end of support date field when upgrading EKS-D latest releases file --- tools/version-tracker/pkg/commands/upgrade/upgrade.go | 7 +++++-- tools/version-tracker/pkg/types/types.go | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/version-tracker/pkg/commands/upgrade/upgrade.go b/tools/version-tracker/pkg/commands/upgrade/upgrade.go index 2b8f2a6c6d..c4b9e2699d 100644 --- a/tools/version-tracker/pkg/commands/upgrade/upgrade.go +++ b/tools/version-tracker/pkg/commands/upgrade/upgrade.go @@ -652,10 +652,13 @@ func updateUpstreamProjectsTrackerFile(projectsList *types.ProjectsList, buildTo } b.Write([]byte("\n")) - // Create a new YAML encoder with an appropriate indentation value and encode the project list into a byte buufer + // Create a new YAML encoder with an appropriate indentation value and encode the project list into a byte buffer yamlEncoder := goyamlv3.NewEncoder(&b) yamlEncoder.SetIndent(2) - yamlEncoder.Encode(&projectsList) + err = yamlEncoder.Encode(&projectsList) + if err != nil { + return fmt.Errorf("encoding the project list into a byte buffer: %v", err) + } err = os.WriteFile(upstreamProjectsTrackerFilePath, b.Bytes(), 0o644) if err != nil { diff --git a/tools/version-tracker/pkg/types/types.go b/tools/version-tracker/pkg/types/types.go index 1eb8933f66..f6b849eedf 100644 --- a/tools/version-tracker/pkg/types/types.go +++ b/tools/version-tracker/pkg/types/types.go @@ -67,10 +67,11 @@ type ImageMetadata struct { } type EKSDistroRelease struct { - Branch string `json:"branch"` - KubeVersion string `json:"kubeVersion"` - Number int `json:"number"` - Dev *bool `json:"dev,omitempty"` + Branch string `json:"branch"` + KubeVersion string `json:"kubeVersion"` + Number int `json:"number"` + Dev *bool `json:"dev,omitempty"` + EndOfStandardSupport string `json:"endOfStandardSupport,omitempty"` } type EKSDistroLatestReleases struct {