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

Configure Renovate #1011

Merged
merged 1 commit into from
May 10, 2023
Merged

Configure Renovate #1011

merged 1 commit into from
May 10, 2023

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented May 4, 2023

Mend Renovate

Welcome to Renovate! This is an onboarding PR to help you understand and configure settings before regular Pull Requests begin.

🚦 To activate Renovate, merge this Pull Request. To disable Renovate, simply close this Pull Request unmerged.


Detected Package Files

  • Dockerfile (dockerfile)
  • .github/workflows/build-images-release.yaml (github-actions)
  • .github/workflows/codeql-analysis.yml (github-actions)
  • .github/workflows/integration-tests.yaml (github-actions)
  • .github/workflows/release.yml (github-actions)
  • .github/workflows/tests.yml (github-actions)
  • go.mod (gomod)

Configuration

🔡 Renovate has detected a custom config for this PR. Feel free to ask for help if you have any doubts and would like it reviewed.

Important: Now that this branch is edited, Renovate can't rebase it from the base branch any more. If you make changes to the base branch that could impact this onboarding PR, please merge them manually.

You have configured Renovate to use the following baseBranches: master, v0.11.

What to Expect

With your current configuration, Renovate will create 4 Pull Requests:

fix(deps): pin dependencies (master)
chore(deps): update all github action dependencies (master)
  • Schedule: ["at any time"]
  • Branch name: renovate/master-all-github-action
  • Merge into: master
  • Upgrade actions/checkout to f095bcc56b7c2baf48f3ac70d6d6782f4f553222
  • Upgrade actions/create-release to 4c11c9fe1dcd9636620a16455165783b20fc7ea0
  • Upgrade actions/download-artifact to e9ef242655d12993efdcda9058dee2db83a2cb9b
  • Upgrade actions/setup-go to fac708d6674e30b6ba41289acaab6d4b75aa0753
  • Upgrade actions/upload-artifact to 65d862660abb392b8c4a3d1195a2108db131dd05
  • Upgrade azure/setup-helm to ac5ee1fca8fba06d82bfc39af726f19ffe037a49
  • Upgrade docker/build-push-action to eafaea8d0f5853934deece2ffa67af59d936562b
  • Upgrade docker/login-action to 40891eba8c2bcd1309b07ba8b11232f313e86779
  • Upgrade docker/setup-buildx-action to a946f06b5ddbde456d0115dc585e8dc3c7a0c3e0
  • Upgrade github/codeql-action to 95cfca769b334017179a1fbe879b6d9b5cddfe54
  • Upgrade golangci/golangci-lint-action to 0d51521d4226fe362fc8aa8ce484ce3cd5299478
  • Upgrade helm/kind-action to 2d96ac1d715d2ea5abee55927b0cce7ec07ca148
  • Upgrade skx/github-action-publish-binaries to 44887b225ceca96efd8a912d39c09ad70312af31
fix(deps): update module gopkg.in/yaml.v2 to v3 (master)
  • Schedule: ["at any time"]
  • Branch name: renovate/master-major-3-all-go-deps-master
  • Merge into: master
  • Upgrade gopkg.in/yaml.v2 to f6f7691b1fdeb513f56608cd2c32c51f8194bf51
chore(deps): update all github action dependencies (v0.11)
  • Schedule: ["at any time"]
  • Branch name: renovate/v0.11-all-github-action
  • Merge into: v0.11
  • Upgrade actions/checkout to f095bcc56b7c2baf48f3ac70d6d6782f4f553222
  • Upgrade actions/create-release to 4c11c9fe1dcd9636620a16455165783b20fc7ea0
  • Upgrade actions/download-artifact to e9ef242655d12993efdcda9058dee2db83a2cb9b
  • Upgrade actions/setup-go to fac708d6674e30b6ba41289acaab6d4b75aa0753
  • Upgrade actions/upload-artifact to 65d862660abb392b8c4a3d1195a2108db131dd05
  • Upgrade docker/build-push-action to eafaea8d0f5853934deece2ffa67af59d936562b
  • Upgrade docker/login-action to 40891eba8c2bcd1309b07ba8b11232f313e86779
  • Upgrade docker/setup-buildx-action to a946f06b5ddbde456d0115dc585e8dc3c7a0c3e0
  • Upgrade github/codeql-action to 95cfca769b334017179a1fbe879b6d9b5cddfe54
  • Upgrade golangci/golangci-lint-action to 0d51521d4226fe362fc8aa8ce484ce3cd5299478
  • Upgrade skx/github-action-publish-binaries to 44887b225ceca96efd8a912d39c09ad70312af31

🚸 Branch creation will be limited to maximum 2 per hour, so it doesn't swamp any CI resources or overwhelm the project. See docs for prhourlylimit for details.


❓ Got questions? Check out Renovate's Docs, particularly the Getting Started section.
If you need any further assistance then you can also request help here.


This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot requested a review from a team as a code owner May 4, 2023 01:08
@renovate renovate bot requested review from chancez and removed request for a team May 4, 2023 01:08
@chancez chancez requested review from a team as code owners May 4, 2023 21:54
@chancez chancez requested review from brlbil and removed request for a team May 4, 2023 21:54
@chancez chancez force-pushed the renovate/configure branch 2 times, most recently from 6074fce to c19bdde Compare May 4, 2023 21:56
@cilium cilium deleted a comment from maintainer-s-little-helper bot May 4, 2023
@cilium cilium deleted a comment from maintainer-s-little-helper bot May 4, 2023
@cilium cilium deleted a comment from maintainer-s-little-helper bot May 4, 2023
@cilium cilium deleted a comment from maintainer-s-little-helper bot May 4, 2023
@chancez chancez requested review from a team and gandro and removed request for a team May 5, 2023 14:58
@chancez chancez self-assigned this May 5, 2023
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Looks good overall. One question around one of the regex patterns (the other one looks good to me!)

renovate.json5 Outdated
// similar to the examples shown here:
// https://docs.renovatebot.com/modules/manager/regex/#advanced-capture
"matchStrings": [
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+.+version: (?<currentValue>.*)"
Copy link
Member

Choose a reason for hiding this comment

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

@chancez Have you tested this by running Renovate locally? The currentValue capture here seems to include the ' quotes and I'm not sure if Renovate will properly parse them:

image

https://regex101.com/r/4EqOrE/1

Copy link
Contributor

@chancez chancez May 8, 2023

Choose a reason for hiding this comment

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

I haven't, I haven't had much success getting it running locally. Getting all the deps locally has been a struggle, and the docker image is x86 only and too slow if emulated. I copied 99.9% of the setup from cilium though, so if this is wrong, it's broken in cilium too. I'll try taking another stab at running it locally.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah we don't use quotes in cilium's CI for go-version. That's the difference.

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay, new commit will update the regex. Here's what I've got instead, which should handle quotes and no-quotes:

https://regex101.com/r/HYe6SP/1

Copy link
Member

Choose a reason for hiding this comment

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

Added a couple of cases at https://regex101.com/r/oErr7U/3

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh man the escaping for this is painful, I miss YAML (words I usually never say).

@gandro gandro added the release-note/ci This PR makes changes to the CI. label May 8, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label PR is blocked until the release note is set label May 8, 2023
Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Thanks @chancez! Some questions / comments

renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
@chancez chancez added the :basecamp: needs-rebase This PR needs to be rebased because it has merge conflicts. label May 8, 2023
@chancez
Copy link
Contributor

chancez commented May 8, 2023

@gandro @kaworu I've pushed some new commits, please take a look.

@chancez
Copy link
Contributor

chancez commented May 8, 2023

Alright I've figured out running renovate. Currently practicing on my fork https://github.com/chancez/hubble. You may notice unexpected PRs as I'm going to revert some recent ones in my fork so I can test how it handles updates for things that are already up to date.

Copy link
Member

@kaworu kaworu left a comment

Choose a reason for hiding this comment

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

Thanks @chancez, LGTM now!

@@ -145,6 +145,16 @@ After a new stable `v$MAJOR.$MINOR` release branch has been created, update the
`target-branch` and `commit-message.prefix` fields in `.github/dependabot.yml`
to point to the newly created branch, instead of the old stable branch.

## Update the `renovate` configuration

After a new stable `v$MAJOR.$MINOR` release branch has been created, update `renovate.json5`:
Copy link
Member

@kaworu kaworu May 9, 2023

Choose a reason for hiding this comment

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

Any reason we're keeping renovate.json5 at the root of the project instead of .github/renovate.json5 like we have at cilium/cilium?

Copy link
Contributor

Choose a reason for hiding this comment

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

The original PR put it at renovate.json at the root, but your right, I can move it into .github I think.

renovate.json5 Outdated Show resolved Hide resolved
renovate.json5 Outdated Show resolved Hide resolved
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thanks!

RELEASE.md Outdated Show resolved Hide resolved
RELEASE.md Outdated Show resolved Hide resolved
@chancez

This comment was marked as outdated.

@chancez
Copy link
Contributor

chancez commented May 9, 2023

Okay I've pushed another commit with the latest changes I'm thinking about after iterating in my fork.

  • I want to remove the schedule initially so we can iterate a bit easier and so that it will open the PRs immediately so we can resolve them after the PR is merged. Once things are settled a bit we can add the schedules back.
  • I made it so it will update both the Dockerfile Go versions and the GHA go-version in the same PR.

Take a look at my fork to see what it would look like with some outdated dependencies. I reverted and changed the versions in my master branch to make it easier to test, not all these PRs will need to be opened once this PR is merged. https://github.com/chancez/hubble/pulls

Comment on lines 136 to 150
"groupName": "golang-stable",
// Restrict the alpine version that can be used on stable branches
"matchPackageNames": [
"docker.io/library/alpine"
],
Copy link
Member

@kaworu kaworu May 10, 2023

Choose a reason for hiding this comment

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

group named golang-stable for the alpine image? 🤔

Copy link
Contributor

@chancez chancez May 10, 2023

Choose a reason for hiding this comment

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

Yes, it's part of the Golang image updates. I suppose this made more sense when the group name was Golang-images but I changed it to Golang and now it's less apt.

This is the same as cilium, it's just less obvious with the inheritance, hence explicitly adding the groupName. Now I question if this should be part of that group or if I should rename the group.

The group name mostly changes the branch/PR name and is how the PRs get grouped together. Do we want a separate PR for alpine updates? That would seem reasonable to me.

@kaworu
Copy link
Member

kaworu commented May 10, 2023

Thanks for the update @chancez, LGTM beside my comment about golang/alpine.

I want to remove the schedule initially so we can iterate a bit easier

nitpicking: instead of removing, we could comment them (json5 ftw) so that we're less likely to forget to get them back at some point?

Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
@chancez
Copy link
Contributor

chancez commented May 10, 2023

@kaworu if you want to make one final pass I can get this merged today/tomorrow and we can work on merging renovate PRs/disabling dependabot if all goes well.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 10, 2023
@chancez chancez merged commit 788b5df into master May 10, 2023
5 checks passed
@chancez chancez deleted the renovate/configure branch May 10, 2023 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:basecamp: needs-rebase This PR needs to be rebased because it has merge conflicts. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants