Skip to content

Commit 4783df3

Browse files
authored
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
1 parent 525f5f1 commit 4783df3

File tree

7 files changed

+21
-4
lines changed

7 files changed

+21
-4
lines changed

config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1384,6 +1384,8 @@ spec:
13841384
- components
13851385
- diagnosticCollector
13861386
type: object
1387+
endOfStandardSupport:
1388+
type: string
13871389
etcdadmBootstrap:
13881390
properties:
13891391
components:

config/manifest/eksa-components.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1553,6 +1553,8 @@ spec:
15531553
- components
15541554
- diagnosticCollector
15551555
type: object
1556+
endOfStandardSupport:
1557+
type: string
15561558
etcdadmBootstrap:
15571559
properties:
15581560
components:
@@ -3453,6 +3455,7 @@ spec:
34533455
- docker
34543456
- eksD
34553457
- eksa
3458+
- endOfStandardSupport
34563459
- etcdadmBootstrap
34573460
- etcdadmController
34583461
- flux

release/api/v1alpha1/bundle_types.go

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func init() {
6161

6262
type VersionsBundle struct {
6363
KubeVersion string `json:"kubeVersion"`
64+
EndOfStandardSupport string `json:"endOfStandardSupport,omitempty"`
6465
EksD EksDRelease `json:"eksD"`
6566
CertManager CertManagerBundle `json:"certManager"`
6667
ClusterAPI CoreClusterAPI `json:"clusterAPI"`

release/cli/pkg/bundles/bundles.go

+4
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ func GetVersionsBundles(r *releasetypes.ReleaseConfig, imageDigests releasetypes
151151
number := strconv.Itoa(release.Number)
152152
dev := release.Dev
153153
kubeVersion := release.KubeVersion
154+
endOfStandardSupport := release.EndOfStandardSupport
154155
shortKubeVersion := strings.Join(strings.SplitN(kubeVersion[1:], ".", 3)[:2], ".")
155156

156157
if !slices.Contains(supportedK8sVersions, channel) {
@@ -206,6 +207,9 @@ func GetVersionsBundles(r *releasetypes.ReleaseConfig, imageDigests releasetypes
206207
Nutanix: nutanixBundle,
207208
Upgrader: upgraderBundle,
208209
}
210+
if endOfStandardSupport != "" {
211+
versionsBundle.EndOfStandardSupport = endOfStandardSupport
212+
}
209213
versionsBundles = append(versionsBundles, versionsBundle)
210214
}
211215
return versionsBundles, nil

release/cli/pkg/filereader/file_reader.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ import (
3737
)
3838

3939
type EksDLatestRelease struct {
40-
Branch string `json:"branch"`
41-
KubeVersion string `json:"kubeVersion"`
42-
Number int `json:"number"`
43-
Dev bool `json:"dev,omitempty"`
40+
Branch string `json:"branch"`
41+
KubeVersion string `json:"kubeVersion"`
42+
Number int `json:"number"`
43+
Dev bool `json:"dev,omitempty"`
44+
EndOfStandardSupport string `json:"endOfStandardSupport,omitempty"`
4445
}
4546

4647
type EksDLatestReleases struct {

release/cli/pkg/operations/testdata/main-bundle-release.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,7 @@ spec:
11431143
os: linux
11441144
uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
11451145
version: v0.0.0-dev+build.0+abcdef1
1146+
endOfStandardSupport: "2024-12-31"
11461147
etcdadmBootstrap:
11471148
components:
11481149
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:
19581959
os: linux
19591960
uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
19601961
version: v0.0.0-dev+build.0+abcdef1
1962+
endOfStandardSupport: "2025-04-30"
19611963
etcdadmBootstrap:
19621964
components:
19631965
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:
27732775
os: linux
27742776
uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
27752777
version: v0.0.0-dev+build.0+abcdef1
2778+
endOfStandardSupport: "2025-08-31"
27762779
etcdadmBootstrap:
27772780
components:
27782781
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:
35883591
os: linux
35893592
uri: public.ecr.aws/release-container-registry/eks-anywhere-diagnostic-collector:v0.21.3-eks-a-v0.0.0-dev-build.1
35903593
version: v0.0.0-dev+build.0+abcdef1
3594+
endOfStandardSupport: "2025-12-31"
35913595
etcdadmBootstrap:
35923596
components:
35933597
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/etcdadm-bootstrap-provider/manifests/bootstrap-etcdadm-bootstrap/v1.0.15/bootstrap-components.yaml

release/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1384,6 +1384,8 @@ spec:
13841384
- components
13851385
- diagnosticCollector
13861386
type: object
1387+
endOfStandardSupport:
1388+
type: string
13871389
etcdadmBootstrap:
13881390
properties:
13891391
components:

0 commit comments

Comments
 (0)