Add end of standard support field to EKS-A bundle (#9115)

* Add end of standard support field to EKS-A bundle * Update testdata file with end of standard support dates for kubernetes versions from v1.28 onwards
aws · Jan 2, 2025 · 4783df3 · 4783df3
1 parent 525f5f1
commit 4783df3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml b/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
@@ -1384,6 +1384,8 @@ spec:
                       - components
                       - diagnosticCollector
                       type: object
+                    endOfStandardSupport:
+                      type: string
                     etcdadmBootstrap:
                       properties:
                         components:

diff --git a/config/manifest/eksa-components.yaml b/config/manifest/eksa-components.yaml
@@ -1553,6 +1553,8 @@ spec:
                       - components
                       - diagnosticCollector
                       type: object
+                    endOfStandardSupport:
+                      type: string
                     etcdadmBootstrap:
                       properties:
                         components:
@@ -3453,6 +3455,7 @@ spec:
                   - docker
                   - eksD
                   - eksa
+                  - endOfStandardSupport
                   - etcdadmBootstrap
                   - etcdadmController
                   - flux

diff --git a/release/api/v1alpha1/bundle_types.go b/release/api/v1alpha1/bundle_types.go
@@ -61,6 +61,7 @@ func init() {
 
 type VersionsBundle struct {
 	KubeVersion                string                           `json:"kubeVersion"`
+	EndOfStandardSupport       string                           `json:"endOfStandardSupport,omitempty"`
 	EksD                       EksDRelease                      `json:"eksD"`
 	CertManager                CertManagerBundle                `json:"certManager"`
 	ClusterAPI                 CoreClusterAPI                   `json:"clusterAPI"`

diff --git a/release/cli/pkg/bundles/bundles.go b/release/cli/pkg/bundles/bundles.go
@@ -151,6 +151,7 @@ func GetVersionsBundles(r *releasetypes.ReleaseConfig, imageDigests releasetypes
 		number := strconv.Itoa(release.Number)
 		dev := release.Dev
 		kubeVersion := release.KubeVersion
+		endOfStandardSupport := release.EndOfStandardSupport
 		shortKubeVersion := strings.Join(strings.SplitN(kubeVersion[1:], ".", 3)[:2], ".")
 
 		if !slices.Contains(supportedK8sVersions, channel) {
@@ -206,6 +207,9 @@ func GetVersionsBundles(r *releasetypes.ReleaseConfig, imageDigests releasetypes
 			Nutanix:                    nutanixBundle,
 			Upgrader:                   upgraderBundle,
 		}
+		if endOfStandardSupport != "" {
+			versionsBundle.EndOfStandardSupport = endOfStandardSupport
+		}
 		versionsBundles = append(versionsBundles, versionsBundle)
 	}
 	return versionsBundles, nil

diff --git a/release/cli/pkg/filereader/file_reader.go b/release/cli/pkg/filereader/file_reader.go
@@ -37,10 +37,11 @@ import (
 )
 
 type EksDLatestRelease 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 EksDLatestReleases struct {

diff --git a/release/cli/pkg/operations/testdata/main-bundle-release.yaml b/release/cli/pkg/operations/testdata/main-bundle-release.yaml
@@ -1143,6 +1143,7 @@ spec:
         os: linux
         uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
       version: v0.0.0-dev+build.0+abcdef1
+    endOfStandardSupport: "2024-12-31"
     etcdadmBootstrap:
       components:
         uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/etcdadm-bootstrap-provider/manifests/bootstrap-etcdadm-bootstrap/v1.0.15/bootstrap-components.yaml
@@ -1958,6 +1959,7 @@ spec:
         os: linux
         uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
       version: v0.0.0-dev+build.0+abcdef1
+    endOfStandardSupport: "2025-04-30"
     etcdadmBootstrap:
       components:
         uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/etcdadm-bootstrap-provider/manifests/bootstrap-etcdadm-bootstrap/v1.0.15/bootstrap-components.yaml
@@ -2773,6 +2775,7 @@ spec:
         os: linux
         uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
       version: v0.0.0-dev+build.0+abcdef1
+    endOfStandardSupport: "2025-08-31"
     etcdadmBootstrap:
       components:
         uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/etcdadm-bootstrap-provider/manifests/bootstrap-etcdadm-bootstrap/v1.0.15/bootstrap-components.yaml
@@ -3588,6 +3591,7 @@ spec:
         os: linux
         uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
       version: v0.0.0-dev+build.0+abcdef1
+    endOfStandardSupport: "2025-12-31"
     etcdadmBootstrap:
       components:
         uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/etcdadm-bootstrap-provider/manifests/bootstrap-etcdadm-bootstrap/v1.0.15/bootstrap-components.yaml

diff --git a/release/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml b/release/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
@@ -1384,6 +1384,8 @@ spec:
                       - components
                       - diagnosticCollector
                       type: object
+                    endOfStandardSupport:
+                      type: string
                     etcdadmBootstrap:
                       properties:
                         components: