Skip to content

Commit 8493983

Browse files
chrissetochrisseto
committed
charts/redpanda: refactor console integration
Refactor the redpanda console integration to first convert `redpanda.RenderState` into a `StaticConfiguration`. The `StaticConfiguration` is then transformed into a `PartialConsoleValues` which is then merged into the subchart values to perform the final rendering. This is done to allow allow the charts' integration to be leveraged by the upcoming console controller. Notable changes include: - Using the bootstrap user for console's auth instead of the first listed SASL user. - Generating a partial version of Console's config to add typing to the configuration code. - The introduction of `operator/pkg/ir` to host non-user facing datastructures. These structs may evolve without impact to our public APIs and help resolve cyclic imports.
1 parent 43ad1a4 commit 8493983

Some content is hidden

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

50 files changed

+5624
-5057
lines changed

‎.changes/unreleased/charts-console-Changed-20250916-163519.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
project: charts/console
2+
kind: Changed
3+
body: Bumped `appVersion` to [`v3.2.2`](https://github.com/redpanda-data/console/releases/tag/v3.2.2).
4+
time: 2025-09-16T16:35:19.769337-04:00

‎.changes/unreleased/charts-redpanda-Changed-20250908-112422.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
project: charts/redpanda
2+
kind: Changed
3+
body: The console integration (`console.enabled=true`) now uses the chart managed bootstrap user rather than the first user from `auth.sasl.users`.
4+
time: 2025-09-08T11:24:22.515452-04:00

‎Taskfile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ tasks:
169169
sh: go work edit -json | jq -j '.Use.[].DiskPath + "/... "'
170170
PKG: '{{ .PKG | default ._PKG }}'
171171
cmds:
172-
- '{{.GO_TEST_RUNNER}} {{.CLI_ARGS}} {{.PKG}}'
172+
- '{{.GO_TEST_RUNNER}} {{.PKG}} {{.CLI_ARGS}}'
173173

174174
test:integration:
175175
desc: "Run all integration tests (~90m)"

‎acceptance/go.mod‎

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.24.3
44

55
require (
66
github.com/cucumber/godog v0.14.1
7-
github.com/prometheus/common v0.64.0
7+
github.com/prometheus/common v0.65.0
88
github.com/redpanda-data/common-go/rpadmin v0.1.14
99
github.com/redpanda-data/redpanda-operator/harpoon v0.0.0-00010101000000-000000000000
10-
github.com/redpanda-data/redpanda-operator/operator v0.0.0-20250528175436-e8cca0053dc6
10+
github.com/redpanda-data/redpanda-operator/operator v0.0.0-00010101000000-000000000000
1111
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250528175436-e8cca0053dc6
1212
github.com/stretchr/testify v1.10.0
13-
github.com/twmb/franz-go v1.19.4
13+
github.com/twmb/franz-go v1.19.5
1414
github.com/twmb/franz-go/pkg/kadm v1.16.0
15-
github.com/twmb/franz-go/pkg/sr v1.4.1-0.20250620172413-c17130ef7765
15+
github.com/twmb/franz-go/pkg/sr v1.5.0
1616
k8s.io/api v0.33.3
1717
k8s.io/apimachinery v0.33.3
1818
k8s.io/client-go v0.33.3
@@ -22,16 +22,16 @@ require (
2222
)
2323

2424
require (
25-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250307204501-0409229c3780.1 // indirect
25+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250613105001-9f2d3c737feb.1 // indirect
2626
buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.36.6-20221127060915-a1ecdc58eccd.1 // indirect
2727
buf.build/gen/go/redpandadata/cloud/protocolbuffers/go v1.36.6-20250616170632-3de895655308.1 // indirect
28-
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.36.6-20240917150400-3f349e63f44a.1 // indirect
29-
cel.dev/expr v0.20.0 // indirect
30-
cloud.google.com/go/auth v0.15.0 // indirect
31-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
28+
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.36.6-20250623133515-cbe59d22e104.1 // indirect
29+
cel.dev/expr v0.24.0 // indirect
30+
cloud.google.com/go/auth v0.16.1 // indirect
31+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
3232
cloud.google.com/go/compute/metadata v0.6.0 // indirect
33-
cloud.google.com/go/iam v1.5.0 // indirect
34-
cloud.google.com/go/secretmanager v1.14.6 // indirect
33+
cloud.google.com/go/iam v1.5.2 // indirect
34+
cloud.google.com/go/secretmanager v1.14.7 // indirect
3535
dario.cat/mergo v1.0.2 // indirect
3636
emperror.dev/errors v0.8.1 // indirect
3737
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
@@ -48,22 +48,22 @@ require (
4848
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4949
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
5050
github.com/Masterminds/squirrel v1.5.4 // indirect
51-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
51+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
5252
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
53-
github.com/aws/aws-sdk-go-v2 v1.32.3 // indirect
54-
github.com/aws/aws-sdk-go-v2/config v1.28.1 // indirect
55-
github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
56-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect
57-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
58-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
59-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
53+
github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
54+
github.com/aws/aws-sdk-go-v2/config v1.29.17 // indirect
55+
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
56+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
57+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
58+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
59+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
6262
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
64-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
66-
github.com/aws/smithy-go v1.22.0 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
66+
github.com/aws/smithy-go v1.22.4 // indirect
6767
github.com/bahlo/generic-list-go v0.2.0 // indirect
6868
github.com/beorn7/perks v1.0.1 // indirect
6969
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -74,7 +74,7 @@ require (
7474
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7575
github.com/chai2010/gettext-go v1.0.2 // indirect
7676
github.com/cisco-open/k8s-objectmatcher v1.9.0 // indirect
77-
github.com/cloudhut/common v0.10.0 // indirect
77+
github.com/cloudhut/common v0.11.0 // indirect
7878
github.com/cockroachdb/errors v1.11.3 // indirect
7979
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
8080
github.com/cockroachdb/redact v1.1.5 // indirect
@@ -96,10 +96,10 @@ require (
9696
github.com/fsnotify/fsnotify v1.9.0 // indirect
9797
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
9898
github.com/getsentry/sentry-go v0.27.0 // indirect
99-
github.com/go-chi/chi/v5 v5.0.12 // indirect
99+
github.com/go-chi/chi/v5 v5.2.2 // indirect
100100
github.com/go-errors/errors v1.5.1 // indirect
101101
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
102-
github.com/go-logr/logr v1.4.2 // indirect
102+
github.com/go-logr/logr v1.4.3 // indirect
103103
github.com/go-logr/stdr v1.2.2 // indirect
104104
github.com/go-logr/zapr v1.3.0 // indirect
105105
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -117,18 +117,18 @@ require (
117117
github.com/gonvenience/wrap v1.2.0 // indirect
118118
github.com/gonvenience/ytbx v1.4.4 // indirect
119119
github.com/google/btree v1.1.3 // indirect
120-
github.com/google/cel-go v0.23.2 // indirect
120+
github.com/google/cel-go v0.25.0 // indirect
121121
github.com/google/gnostic-models v0.6.9 // indirect
122122
github.com/google/go-cmp v0.7.0 // indirect
123123
github.com/google/s2a-go v0.1.9 // indirect
124124
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
125125
github.com/google/uuid v1.6.0 // indirect
126126
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
127-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
127+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
128128
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
129129
github.com/gosuri/uitable v0.0.4 // indirect
130130
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
131-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
131+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 // indirect
132132
github.com/hashicorp/errwrap v1.1.0 // indirect
133133
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
134134
github.com/hashicorp/go-memdb v1.3.4 // indirect
@@ -150,7 +150,12 @@ require (
150150
github.com/json-iterator/go v1.1.12 // indirect
151151
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
152152
github.com/klauspost/compress v1.18.0 // indirect
153-
github.com/knadh/koanf v1.5.0 // indirect
153+
github.com/knadh/koanf/maps v0.1.2 // indirect
154+
github.com/knadh/koanf/parsers/yaml v1.0.0 // indirect
155+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
156+
github.com/knadh/koanf/providers/env v1.1.0 // indirect
157+
github.com/knadh/koanf/providers/file v1.2.0 // indirect
158+
github.com/knadh/koanf/v2 v2.2.1 // indirect
154159
github.com/kr/pretty v0.3.1 // indirect
155160
github.com/kr/text v0.2.0 // indirect
156161
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -170,7 +175,6 @@ require (
170175
github.com/mitchellh/go-ps v1.0.0 // indirect
171176
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
172177
github.com/mitchellh/hashstructure v1.1.0 // indirect
173-
github.com/mitchellh/mapstructure v1.5.0 // indirect
174178
github.com/mitchellh/reflectwalk v1.0.2 // indirect
175179
github.com/moby/spdystream v0.5.0 // indirect
176180
github.com/moby/term v0.5.2 // indirect
@@ -190,31 +194,31 @@ require (
190194
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 // indirect
191195
github.com/prometheus/client_golang v1.22.0 // indirect
192196
github.com/prometheus/client_model v0.6.2 // indirect
193-
github.com/prometheus/procfs v0.16.1 // indirect
197+
github.com/prometheus/procfs v0.17.0 // indirect
194198
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
195-
github.com/redpanda-data/common-go/net v0.1.0 // indirect
199+
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 // indirect
196200
github.com/redpanda-data/common-go/secrets v0.1.3 // indirect
197-
github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20 // indirect
201+
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b // indirect
198202
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.1.0 // indirect
199203
github.com/redpanda-data/redpanda-operator/charts/redpanda/v25 v25.0.0 // indirect
200-
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0 // indirect
204+
github.com/redpanda-data/redpanda-operator/gotohelm v1.2.1-0.20250909192010-c59ff494d04a // indirect
201205
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 // indirect
202206
github.com/rivo/uniseg v0.4.7 // indirect
203-
github.com/rogpeppe/go-internal v1.13.1 // indirect
207+
github.com/rogpeppe/go-internal v1.14.1 // indirect
204208
github.com/rubenv/sql-migrate v1.8.0 // indirect
205209
github.com/russross/blackfriday/v2 v2.1.0 // indirect
206210
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
207211
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
208212
github.com/scalalang2/golang-fifo v1.0.2 // indirect
209-
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
213+
github.com/sergi/go-diff v1.4.0 // indirect
210214
github.com/sethgrid/pester v1.2.0 // indirect
211215
github.com/shopspring/decimal v1.4.0 // indirect
212216
github.com/sirupsen/logrus v1.9.3 // indirect
213217
github.com/spf13/afero v1.12.0 // indirect
214218
github.com/spf13/cast v1.7.0 // indirect
215219
github.com/spf13/cobra v1.9.1 // indirect
216220
github.com/spf13/pflag v1.0.7 // indirect
217-
github.com/stoewer/go-strcase v1.3.0 // indirect
221+
github.com/stoewer/go-strcase v1.3.1 // indirect
218222
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
219223
github.com/tidwall/gjson v1.18.0 // indirect
220224
github.com/tidwall/match v1.1.1 // indirect
@@ -229,8 +233,8 @@ require (
229233
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
230234
go.opentelemetry.io/collector/pdata v1.32.0 // indirect
231235
go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 // indirect
232-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
233-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
236+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
237+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
234238
go.opentelemetry.io/otel v1.36.0 // indirect
235239
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.11.0 // indirect
236240
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.11.0 // indirect
@@ -250,7 +254,7 @@ require (
250254
go.yaml.in/yaml/v2 v2.4.2 // indirect
251255
go.yaml.in/yaml/v3 v3.0.3 // indirect
252256
golang.org/x/crypto v0.40.0 // indirect
253-
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
257+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
254258
golang.org/x/mod v0.25.0 // indirect
255259
golang.org/x/net v0.41.0 // indirect
256260
golang.org/x/oauth2 v0.30.0 // indirect
@@ -261,11 +265,11 @@ require (
261265
golang.org/x/time v0.11.0 // indirect
262266
golang.org/x/tools v0.34.0 // indirect
263267
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
264-
google.golang.org/api v0.227.0 // indirect
265-
google.golang.org/genproto v0.0.0-20250409194420-de1ac958c67a // indirect
266-
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
267-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
268-
google.golang.org/grpc v1.72.1 // indirect
268+
google.golang.org/api v0.233.0 // indirect
269+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
270+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
271+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
272+
google.golang.org/grpc v1.73.0 // indirect
269273
google.golang.org/protobuf v1.36.6 // indirect
270274
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
271275
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)