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

leverage generateTemplates capability of harvester/addons (backport #783) #784

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 30, 2024

Problem:

PR introduces minor changes to installer to leverage the new generateTemplate capability added to harvester/addons

Prior to this change the addon updates were being managed by updates to version_info file, and also updating the version details in the rancher-22-addons.yaml template file.

Solution:

This has been simplified to use the chart versions in version_info file and allow ability to generate template file dynamically. This ensures that chart and image version change is only ever kept in one single location.

addons PR: harvester/addons#4

Related Issue:
harvester/harvester#4937
Test plan:


This is an automatic backport of pull request #783 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 30, 2024
Copy link
Author

mergify bot commented Jul 30, 2024

Cherry-pick of 677447c has failed:

On branch mergify/bp/v1.4/pr-783
Your branch is up to date with 'origin/v1.4'.

You are currently cherry-picking commit 677447c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   scripts/build

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   scripts/build-bundle

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ibrokethecloud
Copy link
Contributor

@Mergifyio rebase

Copy link
Author

mergify bot commented Jul 30, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]
  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@tserong tserong self-requested a review July 30, 2024 07:31
@tserong tserong merged commit e148c83 into v1.4 Jul 30, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/v1.4/pr-783 branch July 30, 2024 10:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants