Skip to content

Conversation

@mallardduck
Copy link
Member

@mallardduck mallardduck commented Mar 11, 2025

A replacement of: #111 after our recent major changes.

Reminder: This is for 2.11.2

@mallardduck
Copy link
Member Author

Technically because we have branches setup fully - we can merge this in main. And prepare backports for 3.x branch to land in 2.11.2 and only those backports have to hold until after 2.11.1 is released.

@mallardduck mallardduck merged commit efff7a3 into rancher:main Apr 14, 2025
9 checks passed
alexandreLamarre pushed a commit that referenced this pull request Apr 16, 2025
Fix bug when finding project root

Pick the last tag instead of the first one

Allow setting GIT_TAG externally too and set on workflow based on tags

Fix install-federator e2e CI to use proper method for current charts

Rewrite a few e2e scripts to be timeout based loops

Add local-e2e target script matching current GHA workflow

Remove unnecessary wait for data steps w/ new script

Correct dev branch tags

Refactor another e2e script to use timeout loop

more shellcheck

Move timeout onto correct step

Fix success condition of alerts script

try e2e without branch tags script

Seed image name for testing via versions script

Add TAG env back to e2e workflow

Refactor another script for wait loop

Fix inconsistent case of strings

Also make sure that Prom Targets are in the "up" state

Adds missing parameters to the commands in */developing.md

fix(ci): Correct k3s version used for e2e testing (#172)

* Add min/max k3s version used for testing

I'm adding both so in the future we can test both extremes, but for now I'm going to PR just using 1 of them.

* go generate

* Add helper script to grab K3S versions as ENVs and use that in local-e2e

* Make debug output actually create envs that should work in GHA instead of just human debug output

* Source k3s version from `build.yaml` for GHA too

* Fix job step ordering so yq will be installed when k3s version env is set

* remove conflicting and unused ids

* Fix helm-locker yq step

* Export tag style of k3s versions

* Use tags directly in GHA

update libraries & dependencies to k8s 1.32

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add updated helm-locker

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add updated helm-project-operator

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add node identification to internal package

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add internal helmcommon package to manage crds

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-locker to use shared crds abstraction

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator to use shared crds abstraction

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update older sub-packages

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update main functions

slightly rework crd management

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update go generate targets

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update to go 1.23

run go mod tidy

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update golangci-lint

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove internal go sub modules

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update controller & crd generation

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Run go generate

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator with new generated code

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

fix crd generation path

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

tweak test labels

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

run go generate

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update images to go 1.23

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

simplify dev scripts

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove dapper from Makefile

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[WIP] simplify CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

vendor chart data in public package

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update integration workflow again

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

use upstream helm during image builds

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[WIP] importing images for integration CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

fix integration testing

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[temp] disable validate-ci

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

lint fixes

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add back deprecated flag logic

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove unecessary CI stuff

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator build-chart destination

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

make crd management consistent with existing flags and add tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update unit test command to exclude integration tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

Add helm-project-operator chart to examples dir

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update path for HPO chart in integration tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

revert public pkg/chart package

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

vendor correct helm-controller dependencies

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update wrangler/go toolchain

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

remove helm-locker e2e CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

bump rancher/klipper-helm to v0.9.4-build20250113

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add KUBECONFIG to version script

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add back embedded controller name logic

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Empty-Commit

rename internal/helm-locker/pkg -> internal/helm-locker

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

rename internal/helm-project-operator/pkg -> internal/helm-project-operator

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

centralize cmd version

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update golangci-lint config

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

bump integration test k3s matrix [1.30.9, 1.32.1]

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

feat: Update Rancher Project Monitoring to use upstream 66.7.1 (#173)

* Update Rancher Project Monitoring to use 0.5.0 chart version that matches Monitoring 66.7.1

* go generate

* bump RPM version for small version fix

* go generate

* fix local-e2e bug

* fix ci artifact file name

* (test) expand CI wait time

* fix: consistently use KUBECTL_WAIT_TIMEOUT

* Make install line more readable

* Every supported k3s/rke2 versions should have it disabled

* make all helm install steps uniform

* Capture more details about Project Monitoring install task

* expand timeouts for scripts

* Update shell for kuberlr-kubectl

* Adjust alerts validation script

Add initial Renovate configuration (#149)

Co-authored-by: renovate-rancher[bot] <119870437+renovate-rancher[bot]@users.noreply.github.com>

Pin dependencies

Migrate config .github/renovate.json

remove dapper

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Update Docker File Deps

manually downgrade to go 1.23

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

ci: Improve ability to use CI in forks & fix multiple tag bug (#189)

* Add empty for debug

* fix all runs-on to be dynamic

* only read vault secrets when repo matches rancher/prom-fed

* Install YQ only in GHA runners where YQ isn't available

* Ensure package-helm uses the current tag for chart versioning

* fix runs-on format to respect matrix.arch

Adjust Alertmanager E2E verification to allow common alerts (#190)

* Adjust Alertmanager E2E verification to allow InfoInhibitor & PrometheusOutOfOrderTimestamps

* Make helm repo url configurable

* Simplify checks to verify based on count vs (count - expected)

feat (renovate) : add gomod deps to renovate config

target specific release branches to match rancher releases

remove legacy branch v0.x from renovate bumps

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Update GitHub Workflow Actions

feat (ci): pass in rancher monitoring version

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

ci: Fix build for dev (#209)

* Fix util-team-charts

* Fix source url to use githubusercontent

* Adjust new var names and add defaults

* Correct for commented out defaults

fix grep for lines starting with "#" (#222)

fix(chart): patch clean up job for CRD bug (#194)

* patch clean up job for CRD bug

* adjust for sh syntax

* fix yaml syntax (use | to make it multiline by default)

Add logs to release controller

Add more debug logs

Fix erroring CI

Fix project registration namespace error

Improve fix

Add logs to release controller

Minor improvements

Add namespace tracker initialization config to charts

Add namespace tracker initialization config to example charts

Add namespace tracker initialization config to runtime struct, minor fixes

Fix lint error

Test for nil helmRelease

Fix wrong reference in example chart

Update reference to helm-project-operator

Fix references to namespaceRegistrationWorkers

Remove empty debug

Aesthetic changes to values.yaml

update readme for proper branching (#232)

Adjust branch rules for 3.x branch (#234)

fix (dev) : adjust helm chart version to use build metadata to encode commit info

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

chore (lint) : update golangci-lint to version 2.0.2

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

waits for cache sync while cache population

Add ability to configure PromFed Priority class (#195)
alexandreLamarre pushed a commit that referenced this pull request Apr 16, 2025
Fix bug when finding project root

Pick the last tag instead of the first one

Allow setting GIT_TAG externally too and set on workflow based on tags

Fix install-federator e2e CI to use proper method for current charts

Rewrite a few e2e scripts to be timeout based loops

Add local-e2e target script matching current GHA workflow

Remove unnecessary wait for data steps w/ new script

Correct dev branch tags

Refactor another e2e script to use timeout loop

more shellcheck

Move timeout onto correct step

Fix success condition of alerts script

try e2e without branch tags script

Seed image name for testing via versions script

Add TAG env back to e2e workflow

Refactor another script for wait loop

Fix inconsistent case of strings

Also make sure that Prom Targets are in the "up" state

Adds missing parameters to the commands in */developing.md

fix(ci): Correct k3s version used for e2e testing (#172)

* Add min/max k3s version used for testing

I'm adding both so in the future we can test both extremes, but for now I'm going to PR just using 1 of them.

* go generate

* Add helper script to grab K3S versions as ENVs and use that in local-e2e

* Make debug output actually create envs that should work in GHA instead of just human debug output

* Source k3s version from `build.yaml` for GHA too

* Fix job step ordering so yq will be installed when k3s version env is set

* remove conflicting and unused ids

* Fix helm-locker yq step

* Export tag style of k3s versions

* Use tags directly in GHA

update libraries & dependencies to k8s 1.32

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add updated helm-locker

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add updated helm-project-operator

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add node identification to internal package

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add internal helmcommon package to manage crds

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-locker to use shared crds abstraction

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator to use shared crds abstraction

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update older sub-packages

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update main functions

slightly rework crd management

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update go generate targets

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update to go 1.23

run go mod tidy

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update golangci-lint

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove internal go sub modules

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update controller & crd generation

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Run go generate

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator with new generated code

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

fix crd generation path

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

tweak test labels

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

run go generate

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update images to go 1.23

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

simplify dev scripts

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove dapper from Makefile

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[WIP] simplify CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

vendor chart data in public package

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update integration workflow again

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

use upstream helm during image builds

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[WIP] importing images for integration CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

fix integration testing

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

[temp] disable validate-ci

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

lint fixes

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Add back deprecated flag logic

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

remove unecessary CI stuff

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update helm-project-operator build-chart destination

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

make crd management consistent with existing flags and add tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update unit test command to exclude integration tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

Add helm-project-operator chart to examples dir

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update path for HPO chart in integration tests

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

revert public pkg/chart package

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

vendor correct helm-controller dependencies

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

update wrangler/go toolchain

Signed-off-by: Alexandre Lamarre <alex7285@gmail.com>

remove helm-locker e2e CI

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

bump rancher/klipper-helm to v0.9.4-build20250113

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add KUBECONFIG to version script

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

add back embedded controller name logic

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Empty-Commit

rename internal/helm-locker/pkg -> internal/helm-locker

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

rename internal/helm-project-operator/pkg -> internal/helm-project-operator

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

centralize cmd version

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

update golangci-lint config

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

bump integration test k3s matrix [1.30.9, 1.32.1]

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

feat: Update Rancher Project Monitoring to use upstream 66.7.1 (#173)

* Update Rancher Project Monitoring to use 0.5.0 chart version that matches Monitoring 66.7.1

* go generate

* bump RPM version for small version fix

* go generate

* fix local-e2e bug

* fix ci artifact file name

* (test) expand CI wait time

* fix: consistently use KUBECTL_WAIT_TIMEOUT

* Make install line more readable

* Every supported k3s/rke2 versions should have it disabled

* make all helm install steps uniform

* Capture more details about Project Monitoring install task

* expand timeouts for scripts

* Update shell for kuberlr-kubectl

* Adjust alerts validation script

Add initial Renovate configuration (#149)

Co-authored-by: renovate-rancher[bot] <119870437+renovate-rancher[bot]@users.noreply.github.com>

Pin dependencies

Migrate config .github/renovate.json

remove dapper

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Update Docker File Deps

manually downgrade to go 1.23

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

ci: Improve ability to use CI in forks & fix multiple tag bug (#189)

* Add empty for debug

* fix all runs-on to be dynamic

* only read vault secrets when repo matches rancher/prom-fed

* Install YQ only in GHA runners where YQ isn't available

* Ensure package-helm uses the current tag for chart versioning

* fix runs-on format to respect matrix.arch

Adjust Alertmanager E2E verification to allow common alerts (#190)

* Adjust Alertmanager E2E verification to allow InfoInhibitor & PrometheusOutOfOrderTimestamps

* Make helm repo url configurable

* Simplify checks to verify based on count vs (count - expected)

feat (renovate) : add gomod deps to renovate config

target specific release branches to match rancher releases

remove legacy branch v0.x from renovate bumps

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

Update GitHub Workflow Actions

feat (ci): pass in rancher monitoring version

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

ci: Fix build for dev (#209)

* Fix util-team-charts

* Fix source url to use githubusercontent

* Adjust new var names and add defaults

* Correct for commented out defaults

fix grep for lines starting with "#" (#222)

fix(chart): patch clean up job for CRD bug (#194)

* patch clean up job for CRD bug

* adjust for sh syntax

* fix yaml syntax (use | to make it multiline by default)

Add logs to release controller

Add more debug logs

Fix erroring CI

Fix project registration namespace error

Improve fix

Add logs to release controller

Minor improvements

Add namespace tracker initialization config to charts

Add namespace tracker initialization config to example charts

Add namespace tracker initialization config to runtime struct, minor fixes

Fix lint error

Test for nil helmRelease

Fix wrong reference in example chart

Update reference to helm-project-operator

Fix references to namespaceRegistrationWorkers

Remove empty debug

Aesthetic changes to values.yaml

update readme for proper branching (#232)

Adjust branch rules for 3.x branch (#234)

fix (dev) : adjust helm chart version to use build metadata to encode commit info

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

chore (lint) : update golangci-lint to version 2.0.2

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

waits for cache sync while cache population

Add ability to configure PromFed Priority class (#195)
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.

2 participants