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

Forwardport 2.5.12 charts #1727

Merged
merged 6 commits into from
Feb 10, 2022
Merged

Conversation

aiyengar2
Copy link
Contributor

@aiyengar2 aiyengar2 commented Feb 10, 2022

This PR forward ports charts released in Rancher 2.5.12 to the Rancher 2.6 branch.

How does this PR work?

  1. We change the configuration.yaml to validate against the release-v2.5 branch (commit 1)
  2. We run make validate, which will compare the contents of our current directory against the contents of the dev-v2.5 branch, copy over assets and charts, modify the index.yaml, and generate a release.yaml that will mark charts that were modified or added if we were to make a release from dev-v2.6 -> release-v2.5 (commit 2)
  3. We revert the change to the configuration.yaml (commit 3), delete the release.yaml (commit 5), and run make validate again (commit 6) to generate the release.yaml that marks charts that were modified or added if we were to make a release from dev-v2.6 -> release-v2.6. This generates the release.yaml as we expect.

commit 4 was a manual change made where I ran rm -rf charts/rancher-operator charts/rancher-operator-crd assets/rancher-operator assets/rancher-operator-crd && make index in order to delete the forward ported rancher-operator charts, since we decided we did not want to move forward with forward porting them.

Copy link
Contributor

@doflamingo721 doflamingo721 left a comment

Choose a reason for hiding this comment

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

LGTM

@aiyengar2 aiyengar2 merged commit caea7dd into rancher:dev-v2.6 Feb 10, 2022
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.

4 participants