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

Adds GitHub flow to automate busybox container SHAs #4965

Merged
merged 9 commits into from
Dec 29, 2021

Conversation

wiardvanrij
Copy link
Member

@wiardvanrij wiardvanrij commented Dec 16, 2021

Signed-off-by: Rij, W. van (Wiard) wiard@outlook.com

Relates to #4949

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

The .github workflow does a cronjob task. It checks Quay for the latest Prometheus/busybox and fetches the SHA's for all platforms. These values are placed as bash variables in .busybox-versions. That file is included in the Makefile so the vars can be used as build arguments.

The cronjob will make a PR against main, if there is a change.

Consider changing the cronjob to do it every 2-3 days, and allow manual updates if needed (?).

The reason we pin the version is that we want to know which version we are using AND that builds are consistent. Not just for the main branch but as well for local development, etc.

Verification

I have tested this in my own fork. Which did work. I assume (ye ye) it should work here as well out of the box. I can't test if we have the proper rights, but it should be fine as I did not use any special things here.

saswatamcode
saswatamcode previously approved these changes Dec 17, 2021
Copy link
Member

@saswatamcode saswatamcode left a comment

Choose a reason for hiding this comment

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

This looks awesome! 💫
Just some questions/suggestions.

.github/workflows/container-version.yaml Show resolved Hide resolved
.github/workflows/container-version.yaml Show resolved Hide resolved
.github/workflows/container-version.yaml Show resolved Hide resolved
matej-g
matej-g previously approved these changes Dec 17, 2021
Copy link
Collaborator

@matej-g matej-g left a comment

Choose a reason for hiding this comment

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

Nicely done 🙌 Few optional suggestion, but it's already good to go 👍

.github/workflows/container-version.yaml Show resolved Hide resolved
.github/workflows/container-version.yaml Outdated Show resolved Hide resolved
scripts/busybox-updater.sh Outdated Show resolved Hide resolved
.github/workflows/container-version.yaml Outdated Show resolved Hide resolved
@wiardvanrij wiardvanrij dismissed stale reviews from matej-g and saswatamcode via 6fc72e3 December 17, 2021 09:48
Makefile Outdated Show resolved Hide resolved
yeya24
yeya24 previously approved these changes Dec 18, 2021
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

LGTM and some nits only. Thanks!

@wiardvanrij
Copy link
Member Author

I currently don't have a workstation anymore, figured to manually edit those things via GitHub online. Seems like it won't sign my commits then.. :(
This might take a bit until I have set up a workplace with proper ssh/gpg etc again. Sorry about that.

@wiardvanrij wiardvanrij force-pushed the feature/busybox-updater branch from f88c8d1 to e4e34ce Compare December 20, 2021 17:32
@pull-request-size pull-request-size bot added size/L and removed size/M labels Dec 22, 2021
@wiardvanrij wiardvanrij force-pushed the feature/busybox-updater branch from 42ebcbc to e4e34ce Compare December 22, 2021 03:38
@pull-request-size pull-request-size bot added size/M and removed size/L labels Dec 22, 2021
@wiardvanrij wiardvanrij force-pushed the feature/busybox-updater branch from e4e34ce to 87424ee Compare December 22, 2021 04:00
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Signed-off-by: Rij, W. van (Wiard) <wiard@outlook.com>
Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Adds newline

Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Adds newline

Signed-off-by: Wiard van Rij <wiard@pop-os.localdomain>
Signed-off-by: Wiard van Rij <wiard@outlook.com>
@wiardvanrij wiardvanrij force-pushed the feature/busybox-updater branch from 87424ee to 2748916 Compare December 22, 2021 04:01
Signed-off-by: Wiard van Rij <wiard@outlook.com>
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

LGTM

@yeya24 yeya24 merged commit 613a003 into thanos-io:main Dec 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants