Skip to content

Add conformance tests for scs-0210-v2 version policy #488

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

Merged
martinmo merged 16 commits into from
Mar 5, 2024
Merged

Add conformance tests for scs-0210-v2 version policy #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88241ac
Add requirements for k8s-version-recency-check.py
martinmo Feb 23, 2024
a325ea9
Refactor and prepare code for additions of v2
martinmo Feb 28, 2024
902f2df
Add work-in-progress support for v2 of the standard
martinmo Feb 28, 2024
38756be
Bugfix
martinmo Feb 29, 2024
eb5fe88
Format for flake8 and fix the logging statements
martinmo Feb 29, 2024
4e839b2
Use set where it is suitable
martinmo Feb 29, 2024
253fb97
Update the help string and doc comments
martinmo Feb 29, 2024
24d042f
Merge branch 'main' into scs-0210-v2-version-policy
martinmo Feb 29, 2024
10270a3
Add proper check if supported K8s upstream branches are provided
martinmo Feb 29, 2024
33320d3
Improve error handling and logging
martinmo Feb 29, 2024
4400b9a
Fix faulty calculation and display of missing versions
martinmo Feb 29, 2024
fae25c6
Incorporate code improvements suggested by reviewers
martinmo Mar 4, 2024
d70f214
Merge branch 'main' into scs-0210-v2-version-policy
martinmo Mar 4, 2024
dd3f27c
Try to collect errors for all contexts instead of failing early
martinmo Mar 4, 2024
7391507
Merge branch 'main' into scs-0210-v2-version-policy
martinmo Mar 5, 2024
45983ba
Warn or bail out if EOL data is outdated
martinmo Mar 5, 2024
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
10 changes: 5 additions & 5 deletions .../k8s-version-recency/config.yaml.template → ...s/k8s-version-policy/config.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ logging:
version: 1
disable_existing_loggers: False
formatters:
k8s-version-recency-check:
k8s_version_policy:
format: "%(levelname)s: %(message)s"
handlers:
console:
class: logging.StreamHandler
formatter: k8s-version-recency-check
formatter: k8s_version_policy
stream: ext://sys.stdout
file:
class: logging.handlers.WatchedFileHandler
formatter: k8s-version-recency-check
formatter: k8s_version_policy
filename: MY-LOG-FILE-NAME.log
root: # Configuring the default (root) logger is highly recommended
handlers: [console]
loggers:
k8s-version-recency-check:
k8s_version_policy:
handlers: [console, file]
propagate: no
propagate: no
12 changes: 12 additions & 0 deletions Tests/kaas/k8s-version-policy/k8s-eol-data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# https://kubernetes.io/releases/patch-releases/#detailed-release-history-for-active-branches

- branch: '1.29'
end-of-life: '2025-02-28'
- branch: '1.28'
end-of-life: '2024-10-28'
- branch: '1.27'
end-of-life: '2024-06-28'
- branch: '1.26'
end-of-life: '2024-02-28'
- branch: '1.25'
end-of-life: '2023-10-28'
Comment on lines +3 to +12
Copy link
Member Author

@martinmo martinmo Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing that bothers me: this file needs to be maintained from now on. I couldn't find a machine readable version upstream, just the Patch releases document.

Copy link
Contributor

@mbuechse mbuechse Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could assume that this rhythm of Oct 28, Feb 28, June 28 goes on, and then we only need to change anything if this rhythm breaks. Then of course we also need to know when these versions come out initially.

Copy link
Member Author

@martinmo martinmo Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. With this scheme, another assumption that can break is that only the minor branch increments. I would like to take that idea into a separate issue.

For this PR, what do you think of issuing a warning if the file seems to be out of date at the time of script execution. This is the case if the file lists less than 3 non-EOL releases. And bail out if there are less than 2. With that approach we would at least see it if we monitor the logs in the CI.

Copy link
Member Author

@martinmo martinmo Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issuing a warning if the file seems to be out of date at the time of script execution. This is the case if the file lists less than 3 non-EOL releases. And bail out if there are less than 2.

I've implemented this in the last commit. If you do not agree with that change, I can easily revert it, no problem :-)

Loading