-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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
cluster-api: introduce prowjob-generator configuration and generate prowjobs #31581
cluster-api: introduce prowjob-generator configuration and generate prowjobs #31581
Conversation
Skipping CI for Draft Pull Request. |
0bbecd1
to
66563fe
Compare
66563fe
to
b014a6c
Compare
c9b8eb4
to
54933a4
Compare
54933a4
to
f598b29
Compare
f598b29
to
7403ebe
Compare
/cc |
c74686b
to
126ad4c
Compare
# This is the configuration file for cluster-apis prowjob-generator which is located | ||
# at: https://github.com/kubernetes-sigs/cluster-api/blob/main/hack/tools/prowjob-generator/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# This is the configuration file for cluster-apis prowjob-generator which is located | |
# at: https://github.com/kubernetes-sigs/cluster-api/blob/main/hack/tools/prowjob-generator/ | |
# This is the configuration file for cluster-apis prowjob-gen which is located | |
# at: https://github.com/kubernetes-sigs/cluster-api/blob/main/hack/tools/prowjob-gen/ |
# be defined without conflicting with unknown field validation. | ||
prow_ignored: | ||
# Branch specific configuration: for each configured branch the generator will create three | ||
# prowjob configuration files (presubmits, periodics, peridocs for upgrade tests) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# prowjob configuration files (presubmits, periodics, peridocs for upgrade tests) | |
# prowjob configuration files (presubmits, periodics, periodics for upgrade tests) |
main: | ||
kubekinsImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240111-cf1d81388e-1.29" | ||
interval: "2h" | ||
# This value determines the minimum Kubernetes supported version for Cluster API management cluster |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# This value determines the minimum Kubernetes supported version for Cluster API management cluster | |
# This value should be the minimum Kubernetes supported version for Cluster API management cluster |
It wouldn't say that it determines what the min supported version is. It's more the other way around
# prowjob configuration files (presubmits, periodics, peridocs for upgrade tests) | ||
branches: | ||
main: | ||
kubekinsImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240111-cf1d81388e-1.29" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add a comment here. The kubekins "minor version" should match the minor version of Kubernetes dependencies used on this branch
(not yet the case on main because we're in the middle of bumping, but that is okay)
# The generator will run each template per branch and use a filename friendly | ||
# branch variable to format the target filename. | ||
templates: | ||
- name: "cluster-api-periodics.yaml.tpl" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Please in a follow-up PR)
I thin I would change the output format.
Today the resulting grouping is a bit strange
![image](https://private-user-images.githubusercontent.com/4662360/296807629-75102c13-f03b-4a0e-9307-93d91bc40a8f.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjQ0MjA3MDIsIm5iZiI6MTcyNDQyMDQwMiwicGF0aCI6Ii80NjYyMzYwLzI5NjgwNzYyOS03NTEwMmMxMy1mMDNiLTRhMGUtOTMwNy05M2Q5MWJjNDBhOGYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDgyMyUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA4MjNUMTM0MDAyWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NjE1YzZiYzUzZTk1NzZjNTM3MWI3Y2IwZjEzYThkOTExZmY3ZjE3ZTkyODhkOWU2MDMyYzM5MmZmZGViZTJiNiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.L5YGRbfCzyg3AFJFwCefwlbCP0Ro0Uyewox0qdhl8Ak)
Basically first all periodics then grouped by branch then normal + upgrade
Then all presubmits
I think I would put the branch at the beginning cluster-api-{branch}-periodics / cluster-api-{branch}-periodics-upgrades cluster-api-{branch}-presubmits
- name: ETCD_VERSION_UPGRADE_TO | ||
value: "{{ index (index $.versions $upgrade.From) "etcd" }}" | ||
- name: COREDNS_VERSION_UPGRADE_TO | ||
value: "{{ index (index $.versions $upgrade.From) "coreDNS" }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be upgrade.To
Probably also means that the config has to be updated
- name: ETCD_VERSION_UPGRADE_TO | ||
value: "{{ index (index $.versions ((last $.config.Upgrades).From)) "etcd" }}" | ||
- name: COREDNS_VERSION_UPGRADE_TO | ||
value: "{{ index (index $.versions ((last $.config.Upgrades).From)) "coreDNS" }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be also .To
lgtm +/- the linter findings I would merge as soon as the findings are addressed (I want to avoid getting churn through an auto-bump) |
Thank you! Merging for now. Let's open follow-up PRs if we want to change something (e.g. if the core CAPI PR changes) As mentioned, I want to avoid a rebase if Prow gets bumped. /lgtm |
/hold Should I squash? |
/hold |
No idea in this repo Can you fix #31581 (comment)? Otherwise the link won't work |
29c2bc4
to
eb97aa0
Compare
Thx! /lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrischdi, sbueringer The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/hold cancel |
@chrischdi: Updated the
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Part of kubernetes-sigs/cluster-api#9937
Introduces config + templates for prowjob-gen and generate configurations