[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
Hi Vladimir, I fully support your idea. We've been inheriting numerous jobs from these repositories in our downstream projects for the past five years. Based on my assessment, adjusting our projects to the new upstream structure should take approximately one to two days. Where can I stay updated on the exact date and time of the procedure? Thanks!
Ok, looks like we don't have any objections so far. Thanks a lot to those people who expressed their opinions. Let me consider the feedback as our agreement to move on with this. So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). Before this we will review and merge those OSH-infra review requests that are in place at the moment and then we will announce the OSH-infra repo freeze. I assume this is likely to happen next week. Will keep you posted. On Fri, Mar 7, 2025 at 3:42 AM <astebenkova@mirantis.com> wrote:
Hi Vladimir,
I fully support your idea. We've been inheriting numerous jobs from these repositories in our downstream projects for the past five years. Based on my assessment, adjusting our projects to the new upstream structure should take approximately one to two days.
Where can I stay updated on the exact date and time of the procedure?
Thanks!
-- Best regards, Kozhukalov Vladimir
On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote: [...]
So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). [...]
Sounds good, best way to sync up with me is in IRC, I expect to be around all next week and am usually awake and online by 13:00 UTC this time of year. -- Jeremy Stanley
Hi team, At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo. We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger. Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows: ``` mkdir osh_merge_tmp cd osh_merge_tmp git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add openstack-helm-infra https://opendev.org/openstack/openstack-helm-infra.git git fetch openstack-helm-infra git merge --allow-unrelated-histories openstack-helm-infra/master ## there must be a merge conflict here with the only file .gitreview git checkout origin/master .gitreview git merge --continue ``` After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master). Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review. After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger. [1] https://review.opendev.org/q/project:openstack/openstack-helm-infra+AND+-is:... On Mon, Mar 10, 2025 at 5:00 PM Jeremy Stanley <fungi@yuggoth.org> wrote:
On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote: [...]
So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). [...]
Sounds good, best way to sync up with me is in IRC, I expect to be around all next week and am usually awake and online by 13:00 UTC this time of year. -- Jeremy Stanley
-- Best regards, Kozhukalov Vladimir
Hi team, This has happened. We've merged our two repos. Test jobs are green now but there will be more changes (mostly cosmetic) regarding this. Here is the project-config PR [1] to stop running gate jobs for the openstack-helm-infra. It will remain at the current state for a couple more weeks and after that we will retire it. Thanks a lot to Jeremy. He suggested corrections for the merger procedure and helped to make this happen. [1] https://review.opendev.org/c/openstack/project-config/+/945127 On Mon, Mar 17, 2025 at 5:12 PM Vladimir Kozhukalov <kozhukalov@gmail.com> wrote:
Hi team,
At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo.
We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger. Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows:
``` mkdir osh_merge_tmp cd osh_merge_tmp git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add openstack-helm-infra https://opendev.org/openstack/openstack-helm-infra.git git fetch openstack-helm-infra git merge --allow-unrelated-histories openstack-helm-infra/master ## there must be a merge conflict here with the only file .gitreview git checkout origin/master .gitreview git merge --continue ``` After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master).
Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review.
After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger.
[1] https://review.opendev.org/q/project:openstack/openstack-helm-infra+AND+-is:...
On Mon, Mar 10, 2025 at 5:00 PM Jeremy Stanley <fungi@yuggoth.org> wrote:
On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote: [...]
So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). [...]
Sounds good, best way to sync up with me is in IRC, I expect to be around all next week and am usually awake and online by 13:00 UTC this time of year. -- Jeremy Stanley
-- Best regards, Kozhukalov Vladimir
-- Best regards, Kozhukalov Vladimir
Hi Vladamir! Thanks for this, just a thought. For those who are running from specific commit sha’s, we aren’t planning to deprecate this repo any time soon? Give us a time to move to this new way of working? Thanks, Karl. 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> Date: Friday, 21 March 2025 at 4:12 am To: Jeremy Stanley <fungi@yuggoth.org> Cc: openstack-discuss@lists.openstack.org <openstack-discuss@lists.openstack.org> Subject: Re: [openstack-helm] Merge openstack-helm and openstack-helm-infra git repos Hi team, This has happened. We've merged our two repos. Test jobs are green now but there will be more changes (mostly cosmetic) regarding this. Here is the project-config PR [1] to stop running gate jobs for the openstack-helm-infra. It will remain at the current state for a couple more weeks and after that we will retire it. Thanks a lot to Jeremy. He suggested corrections for the merger procedure and helped to make this happen. [1] https://review.opendev.org/c/openstack/project-config/+/945127 On Mon, Mar 17, 2025 at 5:12 PM Vladimir Kozhukalov <kozhukalov@gmail.com<mailto:kozhukalov@gmail.com>> wrote: Hi team, At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo. We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger. Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows: ``` mkdir osh_merge_tmp cd osh_merge_tmp git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add openstack-helm-infra https://opendev.org/openstack/openstack-helm-infra.git git fetch openstack-helm-infra git merge --allow-unrelated-histories openstack-helm-infra/master ## there must be a merge conflict here with the only file .gitreview git checkout origin/master .gitreview git merge --continue ``` After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master). Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review. After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger. [1] https://review.opendev.org/q/project:openstack/openstack-helm-infra+AND+-is:... On Mon, Mar 10, 2025 at 5:00 PM Jeremy Stanley <fungi@yuggoth.org<mailto:fungi@yuggoth.org>> wrote: On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote: [...]
So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). [...]
Sounds good, best way to sync up with me is in IRC, I expect to be around all next week and am usually awake and online by 13:00 UTC this time of year. -- Jeremy Stanley -- Best regards, Kozhukalov Vladimir -- Best regards, Kozhukalov Vladimir
Basically the retirement means the following: - All the gate jobs for the repo are disabled - Then we merge the commit that removes everything from the repo except README.rst where we put an announcement that the project is no longer maintained. This means the project is in Read-Only mode. However, iff one would like to continue using a particular commit from this repo then there should not be any problems. Repo will still be hosted on opendev.org. Here is an example of a retired repo [1]. It is important to note that we merged all the code to our main OSH repo [2] and we made some preparations to avoid merge conflicts. In most cases for downstream projects it should be enough to replace the repo url. The helm-toolkit and other infra charts are available in the main repo. [1] https://opendev.org/openstack/openstack-helm-addons.git [2] https://opendev.org/openstack/openstack-helm.git On Thu, Mar 20, 2025 at 10:24 PM Karl Kloppenborg < kkloppenborg@resetdata.com.au> wrote:
Hi Vladamir!
Thanks for this, just a thought.
For those who are running from specific commit sha’s, we aren’t planning to deprecate this repo any time soon?
Give us a time to move to this new way of working?
Thanks, Karl.
Karl Kloppenborg
Chief Technology Officer
m: *+61 437 239 565* *resetdata.com <https://resetdata.com/>*
[image: reset.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-stat... <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 <contact@resetdata.com.au>*
*From: *Vladimir Kozhukalov <kozhukalov@gmail.com> *Date: *Friday, 21 March 2025 at 4:12 am *To: *Jeremy Stanley <fungi@yuggoth.org> *Cc: *openstack-discuss@lists.openstack.org < openstack-discuss@lists.openstack.org> *Subject: *Re: [openstack-helm] Merge openstack-helm and openstack-helm-infra git repos
Hi team,
This has happened. We've merged our two repos. Test jobs are green now but there will be more changes (mostly cosmetic) regarding this.
Here is the project-config PR [1] to stop running gate jobs for the openstack-helm-infra. It will remain at the current state for a couple more weeks and after that we will retire it.
Thanks a lot to Jeremy. He suggested corrections for the merger procedure and helped to make this happen.
[1] https://review.opendev.org/c/openstack/project-config/+/945127
On Mon, Mar 17, 2025 at 5:12 PM Vladimir Kozhukalov <kozhukalov@gmail.com> wrote:
Hi team,
At this point let's consider the openstack/openstack-helm-infra repo frozen. Core team, please do not merge anything to the openstack-helm-infra repo. There are only a few PRs on review [1] at the moment and we will later port them to openstack-helm repo.
We,ve accepted a bunch of patches to reduce the number of merge conflicts during the merger.
Now only one file .gitreview can not be merged automatically. So the procedure (I've tested it) is as follows:
```
mkdir osh_merge_tmp
cd osh_merge_tmp
git clone https://opendev.org/openstack/openstack-helm.git
cd openstack-helm
git remote add openstack-helm-infra https://opendev.org/openstack/openstack-helm-infra.git
git fetch openstack-helm-infra
git merge --allow-unrelated-histories openstack-helm-infra/master ## there must be a merge conflict here with the only file .gitreview git checkout origin/master .gitreview
git merge --continue
```
After that the state of the master branch is ready to be pushed to gerrit (openstack/openstack-helm master).
Tomorrow I am going to reach out to Jeremy in IRC to sync up and to perform the procedure semi-real-time. As we agreed the merged state will be pushed w/o review.
After push is done test jobs WILL BE BROKEN due to wrong paths for test scripts and some Ansible roles/playbooks. We will fix this in the first PR AFTER merger.
[1] https://review.opendev.org/q/project:openstack/openstack-helm-infra+AND+-is:...
On Mon, Mar 10, 2025 at 5:00 PM Jeremy Stanley <fungi@yuggoth.org> wrote:
On 2025-03-10 16:44:30 -0500 (-0500), Vladimir Kozhukalov wrote: [...]
So, next step will be to manually construct the desirable state of the Openstack-helm repo (prepare the exact procedure to merge necessary commits from the openstack-helm-infra) and then I am going to contact Jeremy to arrange the exact time when this can be pushed to the Gerrit directly (w/o review). [...]
Sounds good, best way to sync up with me is in IRC, I expect to be around all next week and am usually awake and online by 13:00 UTC this time of year. -- Jeremy Stanley
--
Best regards, Kozhukalov Vladimir
--
Best regards, Kozhukalov Vladimir
-- Best regards, Kozhukalov Vladimir
participants (4)
-
astebenkova＠mirantis.com
-
Jeremy Stanley
-
Karl Kloppenborg
-
Vladimir Kozhukalov