cluster-api: introduce prowjob-generator configuration and generate prowjobs #31581
Conversation
|
Skipping CI for Draft Pull Request. |
k8s-ci-robot
added
do-not-merge/work-in-progress
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
0bbecd1
to
66563fe
Compare
chrischdi
changed the title
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
66563fe
to
b014a6c
Compare
k8s-ci-robot
added
the
needs-rebase
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
3 times, most recently
from
c9b8eb4
to
54933a4
Compare
chrischdi
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
54933a4
to
f598b29
Compare
k8s-ci-robot
removed
the
needs-rebase
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
f598b29
to
7403ebe
Compare
k8s-ci-robot
added
the
needs-rebase
|
/cc |
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
c74686b
to
126ad4c
Compare
k8s-ci-robot
removed
the
needs-rebase
| # 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.
| # 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.
| # 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.
| # 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.
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.
(Please in a follow-up PR)
I thin I would change the output format.
Today the resulting grouping is a bit strange
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.
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" }}" |
|
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 |
k8s-ci-robot
added
lgtm
|
/hold Should I squash? |
k8s-ci-robot
added
the
do-not-merge/hold
|
/hold |
|
No idea in this repo Can you fix #31581 (comment)? Otherwise the link won't work |
chrischdi
force-pushed
the
pr-capi-prowjob-generator
branch
from
29c2bc4
to
eb97aa0
Compare
k8s-ci-robot
removed
the
lgtm
|
Thx! /lgtm |
k8s-ci-robot
added
the
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 |
k8s-ci-robot
removed
the
do-not-merge/hold
|
@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