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.

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

reconcile kubernetes/kubernetes stableN version markers #20887

Merged
merged 2 commits into from
Feb 18, 2021

Conversation

spiffxp
Copy link
Member

@spiffxp spiffxp commented Feb 17, 2021

Addresses #19922 (comment)

When the gs://k8s-release-dev/ci/k8s-stableN.txt' version markers were rolled forward, the equivalents in gs://kubernetes-release-dev` were missed.

The config for auto-generated release jobs in releng/ was also missed, so some stable1 jobs were pointed at v1.19 (two releases ago instead of 1)

No longer WIP now that:

What I consider out of scope for this PR, but am open to for followup:

  • replace 'stableN' with '1-y' in job names (we lose job history in e.g. testgrid for a bit, but we're early enough in release cycle to make this change IMO)
  • replace uses of '--extract=ci/k8s-stableN' with more concrete version markers

I'm less certain we can drop populating the ci/k8s-stableN version markers without a deprecation window

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/config Issues or PRs related to code in /config area/jobs labels Feb 17, 2021
@k8s-ci-robot k8s-ci-robot added area/release-eng Issues or PRs related to the Release Engineering subproject approved Indicates a PR has been approved by an approver from all required OWNERS files. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Feb 17, 2021
@spiffxp spiffxp force-pushed the reconcile-version-markers branch from a101115 to 3140fd9 Compare February 17, 2021 21:25
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 17, 2021
@spiffxp
Copy link
Member Author

spiffxp commented Feb 17, 2021

Needed to rebase due to #20880 merging

@spiffxp spiffxp force-pushed the reconcile-version-markers branch from 3140fd9 to fbef234 Compare February 17, 2021 23:05
@spiffxp spiffxp force-pushed the reconcile-version-markers branch from fbef234 to be80338 Compare February 17, 2021 23:52
@spiffxp spiffxp changed the title [wip] reconcile kubernetes/kubernetes stableN version markers reconcile kubernetes/kubernetes stableN version markers Feb 18, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 18, 2021
@spiffxp spiffxp force-pushed the reconcile-version-markers branch from be80338 to acf5550 Compare February 18, 2021 01:23
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 18, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, spiffxp

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 1736ab4 into kubernetes:master Feb 18, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Feb 18, 2021
@k8s-ci-robot
Copy link
Contributor

@spiffxp: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

  • key generated.yaml using file config/jobs/kubernetes/generated/generated.yaml
  • key 1.18.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.18.yaml
  • key 1.19.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
  • key 1.20.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml

In response to this:

Addresses #19922 (comment)

When the gs://k8s-release-dev/ci/k8s-stableN.txt' version markers were rolled forward, the equivalents in gs://kubernetes-release-dev` were missed.

The config for auto-generated release jobs in releng/ was also missed, so some stable1 jobs were pointed at v1.19 (two releases ago instead of 1)

No longer WIP now that:

What I consider out of scope for this PR, but am open to for followup:

  • replace 'stableN' with '1-y' in job names (we lose job history in e.g. testgrid for a bit, but we're early enough in release cycle to make this change IMO)
  • replace uses of '--extract=ci/k8s-stableN' with more concrete version markers

I'm less certain we can drop populating the ci/k8s-stableN version markers without a deprecation window

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.

@spiffxp spiffxp deleted the reconcile-version-markers branch February 18, 2021 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/jobs area/release-eng Issues or PRs related to the Release Engineering subproject area/testgrid cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants