search

hashbang / gitops

gitops repo for our kubernetes cluster
23 stars 8 forks source link

wkd: Apply fix for kustomize v5 #153

Closed KellerFuchs closed 1 year ago

KellerFuchs commented 1 year ago

Not yet merged on @drGrove's side... but we use commit hash anyhow. :smiling_imp:

See drGrove/docker-wkd#5

KellerFuchs commented 1 year ago

@hashbang/administrators This is blocking for re-adding the wkd application in argoCD

KellerFuchs commented 1 year ago

@RyanSquared Looks like you amended my commit (to re-sign it yourself?) before pushing, so Github couldn't tell it was the same.

Kind of surprising it let you do that despite branch protection requiring a review, TBH? Might be related to it going '0 reviews required' ?

RyanSquared commented 1 year ago

I merged locally, creating a merge commit, but couldn't push because I was missing commits. I pulled that, which I thought would just rebase my merge commit, but actually rebased yours as well I think. I deleted branch protection because it is making things a pain in the ass and I can't actually find what it's protecting.

KellerFuchs commented 1 year ago

I deleted branch protection because it is making things a pain in the ass and I can't actually find what it's protecting.

It's enforcing that PRs are reviewed and CI (if any) passes? I wouldn't call it 'protection' in the security sense, in our setting, but it does prevent certain classes of human errors

RyanSquared commented 1 year ago

I think it was something to do with how my local repo got in a mangled state. I was able to merge locally but couldn't push because it created a merge commit since it couldn't fast-forward. The branch protection as-is also didn't properly require reviewers. The only thing it was protecting was from pushing to the main branch. If we were to set it up properly, it should also block signed commits and require a non-author review. However, we'd still have the issue with merge commits.