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

Update monitoring and logging addon with template generation (backport #792) #816

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 16, 2024

Problem:

harvester/harvester#6289

Solution:

  1. Update template generation
  2. Check image tag

Related Issue:
harvester/harvester#6289

Test plan:

Peer PR: harvester/addons#14 those 2 PRs can be merged independently.

These additional ENVs will be appended to the version_info file when building, no matter addon side PR harvester/addons#14 is merged or not.

RANCHER_LOGGING_CHART_VERSION="103.1.0+up4.4.0"
RANCHER_MONITORING_CHART_VERSION="103.1.1+up45.31.1"
HARVESTER_EVENTROUTER_FULL_TAG="rancher/harvester-eventrouter:v0.3.1"

build output:

logging chart version is updated to 103.1.0+up4.4.0
monitoring chart version is updated to 103.1.1+up45.31.1
harvester-eventrouter image tag is updated to rancher/harvester-eventrouter:v0.3.1
#!/bin/bash
VM_IMPORT_CONTROLLER_CHART_VERSION="0.4.0"
VM_IMPORT_CONTROLLER_IMAGE="rancher/harvester-vm-import-controller:v0.4.0"
PCIDEVICES_CONTROLLER_CHART_VERSION="0.4.0"
PCIDEVICES_CONTROLLER_IMAGE="rancher/harvester-pcidevices:v0.4.0"
HARVESTER_SEEDER_CHART_VERSION="0.3.0"
HARVESTER_SEEDER_IMAGE="rancher/harvester-seeder:v0.3.0"
NVIDIA_DRIVER_RUNTIME_CHART_VERSION="0.1.1"
RANCHER_LOGGING_CHART_VERSION="103.1.0+up4.4.0"
RANCHER_MONITORING_CHART_VERSION="103.1.1+up45.31.1"
HARVESTER_EVENTROUTER_FULL_TAG="rancher/harvester-eventrouter:v0.3.1"
the rendered addon template
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "0.4.0"
      chart: harvester-vm-import-controller
--
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "0.4.0"
      chart: harvester-pcidevices-controller
--
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "103.1.0+up4.4.0"
      chart: rancher-logging
--
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "103.1.1+up45.31.1"
      chart: rancher-monitoring
--
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "0.3.0"
      chart: harvester-seeder
--
      repo: http://harvester-cluster-repo.cattle-system.svc/charts
      version: "0.1.1"
      chart: nvidia-driver-runtime

```<hr>This is an automatic backport of pull request #792 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Aug 16, 2024

Cherry-pick of e80ee9a has failed:

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

You are currently cherry-picking commit e80ee9a.
  (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/images/harvester-additional-images.txt

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

@tserong tserong force-pushed the mergify/bp/v1.4/pr-792 branch from d57d5fb to 28cf079 Compare August 16, 2024 06:42
@tserong tserong requested a review from bk201 August 16, 2024 06:45
@tserong tserong merged commit 95b7200 into v1.4 Aug 16, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/v1.4/pr-792 branch August 16, 2024 07:10
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