Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 2, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a2eeb3
Add end of standard support field to EKS-A bundle
sp1999 Dec 27, 2024
70648ce
Update testdata file with end of standard support dates for kubernete…
sp1999 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,8 @@ spec:
- components
- diagnosticCollector
type: object
endOfStandardSupport:
type: string
etcdadmBootstrap:
properties:
components:
Expand Down
3 changes: 3 additions & 0 deletions config/manifest/eksa-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,8 @@ spec:
- components
- diagnosticCollector
type: object
endOfStandardSupport:
type: string
etcdadmBootstrap:
properties:
components:
Expand Down Expand Up @@ -3453,6 +3455,7 @@ spec:
- docker
- eksD
- eksa
- endOfStandardSupport
- etcdadmBootstrap
- etcdadmController
- flux
Expand Down
1 change: 1 addition & 0 deletions release/api/v1alpha1/bundle_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 4 additions & 0 deletions release/cli/pkg/bundles/bundles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions release/cli/pkg/filereader/file_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions release/cli/pkg/operations/testdata/main-bundle-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions release/config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,8 @@ spec:
- components
- diagnosticCollector
type: object
endOfStandardSupport:
type: string
etcdadmBootstrap:
properties:
components:
Expand Down
Loading