(feat) Bump dependencies to k8s 1.32.X #141
Conversation
3e56f44 to
dc30f01
Compare
ccd3fcd to
50a263a
Compare
95f774f to
ec2aadc
Compare
|
BTW - I just realized that since this is targeting 1.32 we should ideally wait to ship this along with Rancher 2.11 that officially supports 2.11. And we're using RC libraries intended for Rancher 2.11 which feels wrong to include this soon. Because we don't do branching right now we can't merge this into main and expect it to not affect the February release cycle. So what if you changed this to target 1.31 and Rancher 2.10 based libraries that way it doesn't have to be something we only do in 2.11. Otherwise we have to some how implement branch strategy and do partial reverts before the February release cycle. |
|
@mallardduck The intention was always to bump dependencies as aggressively as possible and branch off the main branch, and downgrade dependencies selectively |
|
@alexandreLamarre - I guess that wasn't super clear. Either way works in the end I guess. However after merging this we need to be careful about what tag is used to test main. If i.e. After merging this the tag for main becomes I think my misunderstanding there also may mean my opinion in change ordering will be different here. Specifically I think we do need to sort out my effort to split charts+image code first. Since having that complete will make us more prepared for the branching once implemented here. |
66c4566 to
4e4e1b9
Compare
8ce27b3 to
0f74917
Compare
5e3a49e to
0094819
Compare
.github/workflows/hl-e2e.yaml
Outdated
There was a problem hiding this comment.
Is this worth keeping - looks commented out.
scripts/integration
Outdated
| # condition that causes the helm-locker tests to fail, because either controller can acquire and harden a helm-release. | ||
|
|
||
| echo "Running helm-locker integration tests" | ||
| KUBECONFIG=$KUBECONFIG go test -cover ./internal/helm-locker |
There was a problem hiding this comment.
🤔 KUBECONFIG=$KUBECONFIG think this isn't needed?
Or does this help KUBECONFIG=something make integration work better? If so, what if it was done as export KUBECONFIG=$KUBECONFIG in versions, I think that would keep that same context consistent for any make scripts.
| @@ -148,7 +148,7 @@ helmProjectOperator: | |||
| job: | |||
| image: | |||
| repository: rancher/klipper-helm | |||
| tag: v0.7.0-build20220315 | |||
| tag: v0.9.3-build20241008 | |||
There was a problem hiding this comment.
Think that rancher/klipper-helm:v0.9.4-build20250113 will match the helm-controller we're targeting with this branch.
d2683e7 to
42c87d9
Compare
5ab8ad9 to
2ab4176
Compare
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>
bda5390 to
4894f1d
Compare
Related issues: