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

feat: add auto bump version ops template #695

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

DrummyFloyd
Copy link
Contributor

@DrummyFloyd DrummyFloyd commented Dec 30, 2023

based on this comment from slack
https://kubefirst.slack.com/archives/C03U34WJ7FW/p1703867034753859
i though to have have such automated mechanism, would be a game changer for the ops template

that's why i came with a quick implementaiton of renovate
this bot will create PR for all argocd APP:kustomization and terraform .

i make a the default setting for the AUTOMERGE( but can be easily change in the JSON file , we can discuss about it if you want) (all config options are here

for me you can allow ALL to an AUTOmerge (in FF mode ) (fastforward merge lover here) .

because you provide a template on a one time based . so no risk to break anything on update in customer side. ( but maybe i'm wrong about it)

meanwhile,
you have to enable install the app trhough the github portal => https://github.com/apps/renovate

then i advise you to make firsly a silent config, like this you can check what is achieve by renovate.

then allow only repository where a config file is present.

more info about renovate here

edit: you can check created MR on my fork https://github.com/DrummyFloyd/gitops-template/pulls?q=is%3Apr+is%3Aclosed

to check how it's looked

@fharper
Copy link
Contributor

fharper commented Jan 2, 2024

Thanks for this PR @DrummyFloyd . Will check with the engineering team what auto updating these dependencies would mean for kubefirst.

@DrummyFloyd
Copy link
Contributor Author

Thank for the review , do not hesitate if you want more info !

@fharper
Copy link
Contributor

fharper commented Jan 7, 2025

Sorry, this fall under the desk. I asked the engineering team to give it a closer look again.

@mrsimonemms
Copy link
Contributor

Thanks @DrummyFloyd

@fharper
Copy link
Contributor

fharper commented Jan 8, 2025

@DrummyFloyd can you sign your commit please 😅

@DrummyFloyd
Copy link
Contributor Author

@DrummyFloyd can you sign your commit please 😅

Dumb question , but how can I sign my commit with your merged stuff ? ^^

@fharper
Copy link
Contributor

fharper commented Jan 8, 2025

@DrummyFloyd oh yeah, AFAIK, it's a PITA to rebase for signing with newer commits... I should have seen it before (I had to merge main to be able to merge this PR, but on this repository we don't have signing check action—need to add one), but unless @mrsimonemms has a magic trick, I guess the easier path is to create a new PR... sorry 😬

@DrummyFloyd
Copy link
Contributor Author

@DrummyFloyd oh yeah, AFAIK, it's a PITA to rebase for signing with newer commits... I should have seen it before (I had to merge main to be able to merge this PR, but on this repository we don't have signing check action—need to add one), but unless @mrsimonemms has a magic trick, I guess the easier path is to create a new PR... sorry 😬

DW , will create this PR later.

Or if you want to merge quickly this just took the diff and do the PR , don't care if it's my name appears or not ^^

@mrsimonemms
Copy link
Contributor

It's not that difficult to sign existing commits. I've not done it for a while so I can't remember exactly how it's done, but this looks about right - https://superuser.com/questions/397149/can-you-gpg-sign-old-commits

@mrsimonemms
Copy link
Contributor

I'll have a look and see if I can do it - I think it'll be a joint commit then.

@mrsimonemms
Copy link
Contributor

Yes, git commit --amend --no-edit -S is your friend.

I also rebased the commits rather than rebased, just because I hate merge commits.

@mrsimonemms mrsimonemms merged commit c0d2c99 into konstructio:main Jan 8, 2025
@fharper
Copy link
Contributor

fharper commented Jan 8, 2025

It's not that difficult to sign existing commits. I've not done it for a while so I can't remember exactly how it's done, but this looks about right - superuser.com/questions/397149/can-you-gpg-sign-old-commits

Yeah, it's what I do for my own commits, but I thought it was a PITA to do that when there are multiple commits after that aren't yours. Thanks anyway, and thanks again @DrummyFloyd !

@DrummyFloyd
Copy link
Contributor Author

Yes, git commit --amend --no-edit -S is your friend.

I also rebased the commits rather than rebased, just because I hate merge commits.

I hate merge commit for that

I forgot the '--no-edit' that's why it change some stuff after on my side ..

Anyway thank you :)

@mrsimonemms
Copy link
Contributor

We'll aim to get your next PR in under a year 😆

Thanks for everything.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants