[openstack-helm] Merge openstack-helm and openstack-helm-infra git repos
Hi dear Openstack-Helmers, I would like to suggest merging the two project git repos: https://opendev.org/openstack/openstack-helm-infra.git https://opendev.org/openstack/openstack-helm.git At some point it seemed reasonable to have separate git repos for openstack and infrastructure charts. But now it looks like we are experiencing more cons than pros. When working on some features we are forced to prepare sets of interdependent patches. Some code can be deduplicated. Also when we publish charts we append two commit hashes as package metadata. Also we can reduce the number of test jobs if we have all chats in one repo. Other people also proposed this earlier. So if there are no objections let's make it done. I understand this is going to affect many of our users. Please express your opinions so we don't break any downstream. If we all agree about this, then I would say we can do this in the mid of March/2025 before 2025.2 PTG. The procedure is going to be smth. like 1. Freeze the infra repo and prepare retirement PSs for it 2. Merge openstack-helm-infra repo into openstack-helm ``` git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add infra https://opendev.org/openstack/openstack-helm-infra.git git fetch infra git checkout -b infra infra/master git checkout master git merge --allow-unrelated-histories infra # resolve not so many conflicts git review ``` 3. Accept merger PS 4. Update documentation 5. Accept infra retirement PSs (openstack-helm-infra and project-config) -- Best regards, Kozhukalov Vladimir
On 2025-02-27 13:57:08 -0600 (-0600), Vladimir Kozhukalov wrote: [...]
The procedure is going to be smth. like
1. Freeze the infra repo and prepare retirement PSs for it 2. Merge openstack-helm-infra repo into openstack-helm ``` git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add infra https://opendev.org/openstack/openstack-helm-infra.git git fetch infra git checkout -b infra infra/master git checkout master git merge --allow-unrelated-histories infra # resolve not so many conflicts git review ``` 3. Accept merger PS [...]
First off, the ACL for the openstack/openstack-helm repo doesn't allow you to push merge commits, so Gerrit is simply going to reject it. But even if it did, this isn't just going to create a single review for the merge commit, it's also going to create reviews for every commit in the branch history which didn't already exist in that project-branch within Gerrit. Instead, if you can construct the repo state you want, as a Gerrit admin I can work with you to push that new branch state into the repository without creating any new reviews. -- Jeremy Stanley
Jeremy, thanks a lot bringing this up and for the recommendation. If we as a team agree with the proposed change I'll definitely contact you to make this happen the most correct way. On Thu, Feb 27, 2025 at 2:18 PM Jeremy Stanley <fungi@yuggoth.org> wrote:
On 2025-02-27 13:57:08 -0600 (-0600), Vladimir Kozhukalov wrote: [...]
The procedure is going to be smth. like
1. Freeze the infra repo and prepare retirement PSs for it 2. Merge openstack-helm-infra repo into openstack-helm ``` git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add infra https://opendev.org/openstack/openstack-helm-infra.git git fetch infra git checkout -b infra infra/master git checkout master git merge --allow-unrelated-histories infra # resolve not so many conflicts git review ``` 3. Accept merger PS [...]
First off, the ACL for the openstack/openstack-helm repo doesn't allow you to push merge commits, so Gerrit is simply going to reject it.
But even if it did, this isn't just going to create a single review for the merge commit, it's also going to create reviews for every commit in the branch history which didn't already exist in that project-branch within Gerrit.
Instead, if you can construct the repo state you want, as a Gerrit admin I can work with you to push that new branch state into the repository without creating any new reviews. -- Jeremy Stanley
-- Best regards, Kozhukalov Vladimir
Morning Vladimir, Yeah I agree with this, we’ve had several instances now where due to infra being at the wrong commit on different stacks it’s caused issues. Because we spend the vast majority of time in Openstack-Helm repo it tends to be forgotten till too late. I support combining this, it’ll also make it easier to handle overall chart deployment and initia standup. This has my vote. Thanks, Karl. Get Outlook for iOS<https://aka.ms/o0ukef> Karl Kloppenborg Chief Technology Officer m: +61 437 239 565 resetdata.com<https://resetdata.com/> [cid:reset_69557fc2-1d63-4932-b5fd-93bd4f39ca7b.png] ResetData supports Mandatory Client Related Financial Disclosures – Scope 3 Emissions Reporting For more information on the phasing of these requirements for business please visit; https://treasury.gov.au/sites/default/files/2024-01/c2024-466491-policy-state.pdf<https://treasury.gov.au/sites/default/files/2024-01/c2024-466491-policy-state.pdf> This email transmission is intended only for the addressee / person responsible for delivery of the message to such person and may contain confidential or privileged information. Confidentiality and legal privilege are not waived or lost by reason of mistaken delivery to you, nor may you use, review, disclose, disseminate or copy any information contained in or attached to it. Whilst this email has been checked for viruses, the sender does not warrant that any attachments are free from viruses or other defects. You assume all liability for any loss, damage or other consequences which may arise from opening or using the attachments. If you received this e-mail in error please delete it and any attachments and kindly notify us by immediately sending an email to contact@resetdata.com.au<mailto:contact@resetdata.com.au> ________________________________ From: Vladimir Kozhukalov <kozhukalov@gmail.com> Sent: Friday, February 28, 2025 7:36:25 AM To: openstack-discuss@lists.openstack.org <openstack-discuss@lists.openstack.org> Subject: Re: [openstack-helm] Merge openstack-helm and openstack-helm-infra git repos Jeremy, thanks a lot bringing this up and for the recommendation. If we as a team agree with the proposed change I'll definitely contact you to make this happen the most correct way. On Thu, Feb 27, 2025 at 2:18 PM Jeremy Stanley <fungi@yuggoth.org<mailto:fungi@yuggoth.org>> wrote: On 2025-02-27 13:57:08 -0600 (-0600), Vladimir Kozhukalov wrote: [...]
The procedure is going to be smth. like
1. Freeze the infra repo and prepare retirement PSs for it 2. Merge openstack-helm-infra repo into openstack-helm ``` git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add infra https://opendev.org/openstack/openstack-helm-infra.git git fetch infra git checkout -b infra infra/master git checkout master git merge --allow-unrelated-histories infra # resolve not so many conflicts git review ``` 3. Accept merger PS [...]
First off, the ACL for the openstack/openstack-helm repo doesn't allow you to push merge commits, so Gerrit is simply going to reject it. But even if it did, this isn't just going to create a single review for the merge commit, it's also going to create reviews for every commit in the branch history which didn't already exist in that project-branch within Gerrit. Instead, if you can construct the repo state you want, as a Gerrit admin I can work with you to push that new branch state into the repository without creating any new reviews. -- Jeremy Stanley -- Best regards, Kozhukalov Vladimir
participants (3)
-
Jeremy Stanley
-
Karl Kloppenborg
-
Vladimir Kozhukalov