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

🌱 hack: add weekly update script for Slack #9343

Merged
merged 1 commit into from
Nov 6, 2023

Conversation

willie-yao
Copy link
Contributor

@willie-yao willie-yao commented Aug 30, 2023

What this PR does / why we need it:

This is a new PR based mainly off of the work by @oscr in #8192
This PR adds a subcommand weekly to the existing notes.go command that generates the weekly updates that the comms team shares on Slack each week. This will make it simpler to create the messages and less chance of mistakes.

$ go run hack/tools/release/notes.go weekly --since 2023-08-13 --until 2023-08-20 --milestone v1.6

Weekly update :rotating_light:
Changes from 2023-08-13 to 2023-08-20 a total of 44 new commits where merged into main.

- 1 Breaking Changes :warning:
         - Improve Context handling in clusterctl (#8939)

- 5 New Features :sparkles:
         - Add automation to create release branch and tags (#9111)
         - block move with annotation (#8690)
         - machineset: adjust preflight check to allow kubelet version skew of 3 for clusters running v1.28 and above (#9222)
         - v1.28: Prepare quickstart, capd and tests for the new release including kind bump (#9160)
         - Add topology-owned label to MachineHealthChecks. (#9191)

- 5 Bug Fixes :bug:
         - test: pin conformance image to a version which includes a fix for the dualstack tests (#9252)
         - tilt: ensure .tiltbuild/bin directory is created early enough, add tilt troubleshooting guide (#9165)
         - Certificate paths in cloud-init scripts should not use a platform-dependent path separator (#9167)
         - Allow to drop useExperimentalRetryJoin field from KubeadmControlPlane.kubeadmConfigSpec (#9170)
         - Fix AddAnnotations for unstructured.Unstructured (#9164)

- 26 Other changes :seedling:

- 7 Documentation and book contributions :book: 

All merged PRs can be viewed in GitHub:
https://github.com/kubernetes-sigs/cluster-api/pulls?q=is%3Apr+closed%3A2023-08-13..2023-08-21+is%3Amerged+milestone%3Av1.6+

_Thanks to all our contributors!_ 😊
/Your friendly comms release team

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

/area release

@willie-yao willie-yao changed the title [WIP] hack: add weekly update script for Slack 🌱 [WIP] hack: add weekly update script for Slack Aug 30, 2023
@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. area/release Issues or PRs related to releasing labels Aug 30, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Aug 30, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 30, 2023
@willie-yao willie-yao force-pushed the weekly-update branch 2 times, most recently from caad7a0 to 4388102 Compare August 30, 2023 23:45
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

Could the weekly tool be a subcommand of the release-notes tool? I feel like this could become unwieldy and there's a duplication of effort. We might want another, similar, tool for emails for example.

@willie-yao willie-yao changed the title 🌱 [WIP] hack: add weekly update script for Slack 🌱 hack: add weekly update script for Slack Aug 31, 2023
@willie-yao
Copy link
Contributor Author

Could the weekly tool be a subcommand of the release-notes tool? I feel like this could become unwieldy and there's a duplication of effort. We might want another, similar, tool for emails for example.

I think that's a great idea actually. There does seem like a lot of duplicated code in the weekly script. I'll work on refactoring it into the notes script.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 4, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 5, 2023
@willie-yao willie-yao force-pushed the weekly-update branch 2 times, most recently from faf38b5 to a49b2d7 Compare September 5, 2023 23:01
@willie-yao
Copy link
Contributor Author

cc @kubernetes-sigs/cluster-api-release-team

Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Great job! One comment inline:

hack/tools/release/notes.go Outdated Show resolved Hide resolved
hack/tools/release/notes.go Outdated Show resolved Hide resolved
hack/tools/release/notes.go Outdated Show resolved Hide resolved
@furkatgofurov7
Copy link
Member

/cc @killianmuldoon @sbueringer hey folks, could you please help reviewing this, since it is very helpful for comms team

@willie-yao
Copy link
Contributor Author

/retest

Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

/lgtm

cc @killianmuldoon

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

LGTM label has been added.

Git tree hash: 8ca7f43f470b0895673a6491fa8854e643c65ff7

Makefile Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 1, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 1, 2023
Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

Last nit from my side:

docs/release/release-tasks.md Outdated Show resolved Hide resolved
Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

/lgtm

cc @killianmuldoon

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

LGTM label has been added.

Git tree hash: 34488ea25c824bb59aaf73680116346f64d09582

@furkatgofurov7
Copy link
Member

/test ?

@k8s-ci-robot
Copy link
Contributor

@furkatgofurov7: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-full-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-28-latest-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main
  • /test pull-cluster-api-e2e-scale-main-experimental

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ?

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.

@furkatgofurov7
Copy link
Member

/test pull-cluster-api-e2e-main

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/approve

Thanks for this - good to see the quick evolution of the release tools this cycle!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 6, 2023
@k8s-ci-robot k8s-ci-robot merged commit 3a0b5cf into kubernetes-sigs:main Nov 6, 2023
21 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Nov 6, 2023
@k8s-infra-cherrypick-robot

@willie-yao: #9343 failed to apply on top of branch "release-1.5":

Applying: Add weekly update script
Using index info to reconstruct a base tree...
M	Makefile
M	docs/release/release-tasks.md
M	hack/tools/release/notes.go
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/release/notes/main.go
CONFLICT (content): Merge conflict in hack/tools/release/notes/main.go
Auto-merging docs/release/release-tasks.md
CONFLICT (content): Merge conflict in docs/release/release-tasks.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add weekly update script
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.5

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.

@k8s-infra-cherrypick-robot

@willie-yao: #9343 failed to apply on top of branch "release-1.4":

Applying: Add weekly update script
Using index info to reconstruct a base tree...
M	Makefile
M	docs/release/release-tasks.md
M	hack/tools/release/notes.go
Falling back to patching base and 3-way merge...
Auto-merging hack/tools/release/notes/main.go
CONFLICT (content): Merge conflict in hack/tools/release/notes/main.go
Auto-merging docs/release/release-tasks.md
CONFLICT (content): Merge conflict in docs/release/release-tasks.md
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add weekly update script
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.4

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.

@killianmuldoon
Copy link
Contributor

Like with the release notes tool it would be better IMO to only ever use this from main instead of trying to backport all changes.

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/release Issues or PRs related to releasing 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. 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.

None yet

9 participants