Repository navigation
fix(deploy): stale file:// Chart.lock and the Strimzi CRD conflict no longer stop kates deploy - #450
Merged
Merged
Conversation
…le Chart.lock no longer stops a deploy charts/*/*.lock is git-ignored, so a checkout keeps whatever Chart.lock its first `helm dependency build` wrote. Since #447 moved kafka-common to 0.1.1, every older checkout's connect-cluster and mirror-maker2 locks name 0.1.0, and `helm dependency build` refuses them as out of sync. `kates deploy` and `kates migrate` now run `helm dependency update --skip-refresh` on these two charts: their only dependency is file://, so regenerating the lock is offline and cannot drift. The Strimzi operator chart keeps `build`, where the pin matters.
…eady applied applyLocalStrimziCRDs server-side-applies the Strimzi CRDs as the "kubectl" field manager. On a fresh install Helm 4 then applies the chart's crds/ again as "helm" without forcing, and fails with a conflict over .spec.versions. Pass --skip-crds so the CRDs are applied once, by the step that already owns them.
bmscomp
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
kates deployfailed with:charts/*/*.lockis git-ignored, so a checkout keeps theChart.lockits firsthelm dependency buildwrote. #447 movedkafka-commonto 0.1.1; older checkouts' connect-cluster and mirror-maker2 locks still name 0.1.0, andhelm dependency buildrefuses them.Fix
kates deploy(connect-cluster, mirror-maker2) andkates migrate(ensureMirrorChartDeps) runhelm dependency update --skip-refreshinstead ofbuild. Their only dependency isfile://../kafka-common, so regenerating the lock is offline and cannot drift. The Strimzi operator chart keepsbuild, where the Chart.lock pin matters.Tests
go test ./cmdpasses;golangci-lint --new-from-revreports 0 issues.helm dependency update --skip-refreshrewrote both to kafka-common 0.1.1, andhelm dependency buildthen passes.kates deploy.charts/kates-platform/Chart.lockis stale too, butkates deploydoes not build it;make platform-chart-depsupdates it.Also: the Strimzi helm install skips CRDs (from #449)
applyLocalStrimziCRDsserver-side-applies the Strimzi CRDs as thekubectlfield manager; Helm 4'supgrade --installthen re-applied the chart'scrds/ashelmon a fresh install and failed withconflict with "kubectl": .spec.versions. The Strimzi upgrade now passes--skip-crds, and the Group A test asserts it. This PR carries that commit so one deploy has both fixes; #449 is the same change on its own.