Skip to content

Commit 9c9aa06

Browse files
committed
[K8S-537] bind operator and operator chart versions
Prior to this commit the operator helm chart was managed as a standalone module/project. Doing so resulted in needless confusion and compatibility issues. This commit moves `charts/operator` to `operator/chart` and combines the go modules into one, effectively making the release and development process of the operator and its chart one in the same. (cherry picked from commit 4ac62a0)
1 parent 312bab8 commit 9c9aa06

File tree

77 files changed

+6587
-19339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+6587
-19339
lines changed

.changes/unreleased/charts-operator-Changed-20250310-170442.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
project: operator
2+
kind: Changed
3+
body: "[Chart] Moved all template rendering into `entry-point.yaml` to match the redpanda and console charts."
4+
time: 2025-03-10T17:04:42.270572-04:00
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
project: operator
2+
kind: Changed
3+
body: |-
4+
The redpanda operator's helm chart has been merged into the operator itself.
5+
6+
Going forward the chart's `version` and `appVersion` will always be equal.
7+
time: 2025-03-27T13:21:32.469272-04:00

.changes/unreleased/charts-operator-Removed-20250327-130201.yaml renamed to .changes/unreleased/operator-Removed-20250327-130201.yaml

File renamed without changes.

.changie.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,3 @@ projects:
4343
- label: Connectors Helm Chart
4444
key: charts/connectors
4545
changelog: charts/connectors/CHANGELOG.md
46-
- label: Redpanda Operator Helm Chart
47-
key: charts/operator
48-
changelog: charts/operator/CHANGELOG.md

Taskfile.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ vars:
3838
# `sed` is used to trim off the qualifying parts of the tag so we just get the "version".
3939
OPERATOR_VERSION:
4040
sh: git describe --dirty --tags --match 'v*' --match 'operator/v*' | sed 's#^operator/##'
41-
OPERATOR_CHART_VERSION:
42-
# NB: OPERATOR_CHART_VERSION is currently only used for the operator chart's nightly releases.
43-
sh: git describe --dirty --tags --match 'charts/operator/v*' --always | sed 's#^charts/operator/##'
4441

4542
includes:
4643
build: taskfiles/build.yml

acceptance/main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var setupSuite = sync.OnceValues(func() (*framework.Suite, error) {
6060
WithCRDDirectory("../operator/config/crd/bases/toolkit.fluxcd.io").
6161
OnFeature(func(ctx context.Context, t framework.TestingT) {
6262
t.Log("Installing Redpanda operator chart")
63-
t.InstallLocalHelmChart(ctx, "../charts/operator", helm.InstallOptions{
63+
t.InstallLocalHelmChart(ctx, "../operator/chart", helm.InstallOptions{
6464
Name: "redpanda-operator",
6565
Namespace: t.IsolateNamespace(ctx),
6666
Values: map[string]any{
@@ -75,7 +75,7 @@ var setupSuite = sync.OnceValues(func() (*framework.Suite, error) {
7575
},
7676
"additionalCmdFlags": []string{"--additional-controllers=all", "--enable-helm-controllers=false", "--force-defluxed-mode"},
7777
},
78-
}, helm.Dependency{Name: "prometheus", Repository: "https://prometheus-community.github.io/helm-charts"})
78+
})
7979
t.Log("Successfully installed Redpanda operator chart")
8080
}).
8181
RegisterTag("cluster", 1, ClusterTag).

charts/operator/CHANGELOG.md

Lines changed: 0 additions & 154 deletions
This file was deleted.

charts/operator/go.mod

Lines changed: 0 additions & 190 deletions
This file was deleted.

0 commit comments

Comments
 (0)