Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cli/cmd/deploy_components.go
Original file line number Diff line number Diff line change
Expand Up @@ -782,8 +782,12 @@ func deployGroupA(dc *deployContext) error {
//
// --reset-values: pre-chart releases stored flat upstream keys that
// now live under the subchart key, and the schema rejects them.
//
// --skip-crds: applyLocalStrimziCRDs already applied them as the
// "kubectl" field manager; Helm 4 re-applying crds/ on a fresh
// install conflicts with it over .spec.versions.
opArgs := []string{"upgrade", "--install", "strimzi-operator", chartDir, "-n", "strimzi-operator",
"--reset-values",
"--reset-values", "--skip-crds",
"-f", dc.chartOverlay("charts/strimzi-operator"),
"--set", "strimzi-kafka-operator.kubernetesServiceDnsDomain=" + clusterDomain,
"--set", "crdUpgrade.enabled=false"}
Expand Down
1 change: 1 addition & 0 deletions cli/cmd/deploy_components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@ func TestDeployGroupAAppliesLocalStrimziCRDsAndDisablesHook(t *testing.T) {
for _, want := range []string{
"upgrade --install strimzi-operator /cache/wrapper/1.2.0",
"--set crdUpgrade.enabled=false",
"--skip-crds",
"--set strimziVersion=1.2.0",
"--set strimzi-kafka-operator.kubernetesServiceDnsDomain=cluster.test",
} {
Expand Down
Loading