Skip to content

Commit 312bab8

Browse files
andrewstuckiandrewstucki
authored
Update redpanda version for operator release (#677)
1 parent 6c46c5e commit 312bab8

File tree

10 files changed

+111
-109
lines changed

10 files changed

+111
-109
lines changed

‎licenses/third_party.md‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ run `task generate:third-party-licenses-list`
1414
| :----------: | :------------: |
1515
| buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate | [Apache-2.0](https://github.com/bufbuild/protovalidate/blob/main/LICENSE) |
1616
| buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go/protoc-gen-openapiv2/options | [BSD-3-Clause](https://github.com/grpc-ecosystem/grpc-gateway/blob/main/LICENSE) |
17-
| cloud.google.com/go/auth | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/v0.7.2/auth/LICENSE) |
18-
| cloud.google.com/go/auth/oauth2adapt | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt/v0.2.3/auth/oauth2adapt/LICENSE) |
17+
| cloud.google.com/go/auth | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.3/auth/LICENSE) |
18+
| cloud.google.com/go/auth/oauth2adapt | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/oauth2adapt/v0.2.4/auth/oauth2adapt/LICENSE) |
1919
| cloud.google.com/go/compute/metadata | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/compute/metadata/v0.5.0/compute/metadata/LICENSE) |
20-
| cloud.google.com/go/iam | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/iam/v1.1.11/iam/LICENSE) |
21-
| cloud.google.com/go/internal | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/v0.115.0/LICENSE) |
22-
| cloud.google.com/go/storage | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/storage/v1.42.0/storage/LICENSE) |
20+
| cloud.google.com/go/iam | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/iam/v1.2.1/iam/LICENSE) |
21+
| cloud.google.com/go/internal | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/v0.116.0/LICENSE) |
22+
| cloud.google.com/go/storage | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/storage/v1.43.0/storage/LICENSE) |
2323
| connectrpc.com/connect | [Apache-2.0](https://github.com/connectrpc/connect-go/blob/v1.16.2/LICENSE) |
2424
| dario.cat/mergo | [BSD-3-Clause](https://github.com/imdario/mergo/blob/v1.0.1/LICENSE) |
2525
| emperror.dev/errors | [MIT](https://github.com/emperror/errors/blob/v0.8.1/LICENSE) |
@@ -171,6 +171,7 @@ run `task generate:third-party-licenses-list`
171171
| github.com/go-openapi/strfmt | [Apache-2.0](https://github.com/go-openapi/strfmt/blob/v0.21.9/LICENSE) |
172172
| github.com/go-openapi/swag | [Apache-2.0](https://github.com/go-openapi/swag/blob/v0.23.0/LICENSE) |
173173
| github.com/go-openapi/validate | [Apache-2.0](https://github.com/go-openapi/validate/blob/v0.22.3/LICENSE) |
174+
| github.com/go-viper/mapstructure/v2 | [MIT](https://github.com/go-viper/mapstructure/blob/v2.2.1/LICENSE) |
174175
| github.com/gobwas/glob | [MIT](https://github.com/gobwas/glob/blob/v0.2.3/LICENSE) |
175176
| github.com/gogo/protobuf | [BSD-3-Clause](https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE) |
176177
| github.com/golang-jwt/jwt/v4 | [MIT](https://github.com/golang-jwt/jwt/blob/v4.5.0/LICENSE) |
@@ -195,10 +196,10 @@ run `task generate:third-party-licenses-list`
195196
| github.com/google/go-github/v55/github | [BSD-3-Clause](https://github.com/google/go-github/blob/v55.0.0/LICENSE) |
196197
| github.com/google/go-querystring/query | [BSD-3-Clause](https://github.com/google/go-querystring/blob/v1.1.0/LICENSE) |
197198
| github.com/google/gofuzz | [Apache-2.0](https://github.com/google/gofuzz/blob/v1.2.0/LICENSE) |
198-
| github.com/google/s2a-go | [Apache-2.0](https://github.com/google/s2a-go/blob/v0.1.7/LICENSE.md) |
199+
| github.com/google/s2a-go | [Apache-2.0](https://github.com/google/s2a-go/blob/v0.1.8/LICENSE.md) |
199200
| github.com/google/shlex | [Apache-2.0](https://github.com/google/shlex/blob/e7afc7fbc510/COPYING) |
200201
| github.com/google/uuid | [BSD-3-Clause](https://github.com/google/uuid/blob/v1.6.0/LICENSE) |
201-
| github.com/googleapis/enterprise-certificate-proxy/client | [Apache-2.0](https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.2/LICENSE) |
202+
| github.com/googleapis/enterprise-certificate-proxy/client | [Apache-2.0](https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.4/LICENSE) |
202203
| github.com/googleapis/gax-go/v2 | [BSD-3-Clause](https://github.com/googleapis/gax-go/blob/v2.13.0/v2/LICENSE) |
203204
| github.com/gorilla/mux | [BSD-3-Clause](https://github.com/gorilla/mux/blob/v1.8.1/LICENSE) |
204205
| github.com/gorilla/websocket | [BSD-2-Clause](https://github.com/gorilla/websocket/blob/v1.5.0/LICENSE) |
@@ -361,14 +362,14 @@ run `task generate:third-party-licenses-list`
361362
| github.com/zeebo/blake3 | [CC0-1.0](https://github.com/zeebo/blake3/blob/v0.2.3/LICENSE) |
362363
| go.mongodb.org/mongo-driver | [Apache-2.0](https://github.com/mongodb/mongo-go-driver/blob/v1.13.1/LICENSE) |
363364
| go.opencensus.io | [Apache-2.0](https://github.com/census-instrumentation/opencensus-go/blob/v0.24.0/LICENSE) |
364-
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/google.golang.org/grpc/otelgrpc/v0.49.0/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE) |
365-
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/net/http/otelhttp/v0.53.0/instrumentation/net/http/otelhttp/LICENSE) |
366-
| go.opentelemetry.io/otel | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/v1.28.0/LICENSE) |
365+
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/google.golang.org/grpc/otelgrpc/v0.54.0/instrumentation/google.golang.org/grpc/otelgrpc/LICENSE) |
366+
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/instrumentation/net/http/otelhttp/v0.54.0/instrumentation/net/http/otelhttp/LICENSE) |
367+
| go.opentelemetry.io/otel | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/v1.29.0/LICENSE) |
367368
| go.opentelemetry.io/otel/exporters/otlp/otlptrace | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/exporters/otlp/otlptrace/v1.24.0/exporters/otlp/otlptrace/LICENSE) |
368369
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/exporters/otlp/otlptrace/otlptracegrpc/v1.21.0/exporters/otlp/otlptrace/otlptracegrpc/LICENSE) |
369-
| go.opentelemetry.io/otel/metric | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.28.0/metric/LICENSE) |
370+
| go.opentelemetry.io/otel/metric | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.29.0/metric/LICENSE) |
370371
| go.opentelemetry.io/otel/sdk | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/sdk/v1.28.0/sdk/LICENSE) |
371-
| go.opentelemetry.io/otel/trace | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.28.0/trace/LICENSE) |
372+
| go.opentelemetry.io/otel/trace | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.29.0/trace/LICENSE) |
372373
| go.opentelemetry.io/proto/otlp | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-proto-go/blob/otlp/v1.1.0/otlp/LICENSE) |
373374
| go.starlark.net | [BSD-3-Clause](https://github.com/google/starlark-go/blob/90ade8b19d09/LICENSE) |
374375
| go.step.sm/crypto | [Apache-2.0](https://github.com/smallstep/crypto/blob/v0.40.0/LICENSE) |
@@ -379,20 +380,20 @@ run `task generate:third-party-licenses-list`
379380
| golang.org/x/exp | [BSD-3-Clause](https://cs.opensource.google/go/x/exp/+/e7e105de:LICENSE) |
380381
| golang.org/x/mod | [BSD-3-Clause](https://cs.opensource.google/go/x/mod/+/v0.22.0:LICENSE) |
381382
| golang.org/x/net | [BSD-3-Clause](https://cs.opensource.google/go/x/net/+/v0.38.0:LICENSE) |
382-
| golang.org/x/oauth2 | [BSD-3-Clause](https://cs.opensource.google/go/x/oauth2/+/v0.23.0:LICENSE) |
383+
| golang.org/x/oauth2 | [BSD-3-Clause](https://cs.opensource.google/go/x/oauth2/+/v0.28.0:LICENSE) |
383384
| golang.org/x/sync | [BSD-3-Clause](https://cs.opensource.google/go/x/sync/+/v0.12.0:LICENSE) |
384385
| golang.org/x/sys | [BSD-3-Clause](https://cs.opensource.google/go/x/sys/+/v0.31.0:LICENSE) |
385386
| golang.org/x/term | [BSD-3-Clause](https://cs.opensource.google/go/x/term/+/v0.30.0:LICENSE) |
386387
| golang.org/x/text | [BSD-3-Clause](https://cs.opensource.google/go/x/text/+/v0.23.0:LICENSE) |
387388
| golang.org/x/time/rate | [BSD-3-Clause](https://cs.opensource.google/go/x/time/+/v0.7.0:LICENSE) |
388389
| golang.org/x/tools | [BSD-3-Clause](https://cs.opensource.google/go/x/tools/+/v0.29.0:LICENSE) |
389390
| gomodules.xyz/jsonpatch/v2 | [Apache-2.0](https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE) |
390-
| google.golang.org/api | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.189.0/LICENSE) |
391-
| google.golang.org/api/internal/third_party/uritemplates | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.189.0/internal/third_party/uritemplates/LICENSE) |
392-
| google.golang.org/genproto/googleapis/api | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/93522f1f2a9f/googleapis/api/LICENSE) |
393-
| google.golang.org/genproto/googleapis/rpc | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/573a1156607a/googleapis/rpc/LICENSE) |
394-
| google.golang.org/genproto/googleapis/type | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/93522f1f2a9f/LICENSE) |
395-
| google.golang.org/grpc | [Apache-2.0](https://github.com/grpc/grpc-go/blob/v1.65.0/LICENSE) |
391+
| google.golang.org/api | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.197.0/LICENSE) |
392+
| google.golang.org/api/internal/third_party/uritemplates | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.197.0/internal/third_party/uritemplates/LICENSE) |
393+
| google.golang.org/genproto/googleapis/api | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/5fefd90f89a9/googleapis/api/LICENSE) |
394+
| google.golang.org/genproto/googleapis/rpc | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/796eee8c2d53/googleapis/rpc/LICENSE) |
395+
| google.golang.org/genproto/googleapis/type | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/796eee8c2d53/LICENSE) |
396+
| google.golang.org/grpc | [Apache-2.0](https://github.com/grpc/grpc-go/blob/v1.67.1/LICENSE) |
396397
| google.golang.org/protobuf | [BSD-3-Clause](https://github.com/protocolbuffers/protobuf-go/blob/v1.35.1/LICENSE) |
397398
| gopkg.in/evanphx/json-patch.v5 | [BSD-3-Clause](https://github.com/evanphx/json-patch/blob/v5.7.0/LICENSE) |
398399
| gopkg.in/go-jose/go-jose.v2 | [Apache-2.0](https://github.com/go-jose/go-jose/blob/v2.6.2/LICENSE) |

‎operator/api/redpanda/v1alpha2/redpanda_types.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ import (
2525
"k8s.io/utils/ptr"
2626

2727
redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
28+
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
2829
vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
29-
"github.com/redpanda-data/redpanda-operator/pkg/gotohelm/helmette"
30-
"github.com/redpanda-data/redpanda-operator/pkg/kube"
3130
)
3231

3332
const (
@@ -45,7 +44,7 @@ type ChartRef struct {
4544
// Defines the version of the Redpanda Helm chart to deploy.
4645
// Only charts in the v5.9.x and v5.10.x series are supported.
4746
//
48-
// If unspecified, defaults to the operator's vendored chart version: `v5.9.21`.
47+
// If unspecified, defaults to the operator's vendored chart version: `v5.10.1`.
4948
//
5049
// It is recommended to leave this field unspecified.
5150
// +kubebuilder:validation:Type=string
@@ -72,7 +71,7 @@ type ChartRef struct {
7271
// its internal Go-based Helm chart. FluxCD resources are still
7372
// managed by the operator albeit in a suspended state.
7473
//
75-
// If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The
74+
// If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The
7675
// operator does not reconcile any Redpanda resources that have `chartVersion` set to
7776
// another version while `useFlux` is `false.
7877
// +optional
@@ -324,5 +323,5 @@ func (in *Redpanda) GetDot(restConfig *rest.Config) (*helmette.Dot, error) {
324323
IsUpgrade: true,
325324
}
326325

327-
return redpandachart.Chart.Dot(ptr.To(kube.RestToConfig(restConfig)), release, partial)
326+
return redpandachart.Chart.Dot(restConfig, release, partial)
328327
}

‎operator/api/redpanda/v1alpha2/testdata/crd-docs.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Certificate configures TLS certificates.
394394
Only charts in the v5.9.x and v5.10.x series are supported. +
395395

396396

397-
If unspecified, defaults to the operator's vendored chart version: `v5.9.21`. +
397+
If unspecified, defaults to the operator's vendored chart version: `v5.10.1`. +
398398

399399

400400
It is recommended to leave this field unspecified. + | | Pattern: `^v?5\.(9|10)\.` +
@@ -420,7 +420,7 @@ its internal Go-based Helm chart. FluxCD resources are still +
420420
managed by the operator albeit in a suspended state. +
421421

422422

423-
If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The +
423+
If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The +
424424
operator does not reconcile any Redpanda resources that have `chartVersion` set to +
425425
another version while `useFlux` is `false. + | |
426426
|===

‎operator/cmd/run/run.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import (
5959
consolepkg "github.com/redpanda-data/redpanda-operator/operator/pkg/console"
6060
"github.com/redpanda-data/redpanda-operator/operator/pkg/resources"
6161
redpandawebhooks "github.com/redpanda-data/redpanda-operator/operator/webhooks/redpanda"
62-
"github.com/redpanda-data/redpanda-operator/pkg/kube"
6362
)
6463

6564
type RedpandaController string
@@ -559,7 +558,7 @@ func Run(
559558

560559
// Redpanda Reconciler
561560
if err = (&redpandacontrollers.RedpandaReconciler{
562-
KubeConfig: kube.RestToConfig(mgr.GetConfig()),
561+
KubeConfig: mgr.GetConfig(),
563562
Client: mgr.GetClient(),
564563
Scheme: mgr.GetScheme(),
565564
EventRecorder: mgr.GetEventRecorderFor("RedpandaReconciler"),

‎operator/config/crd/bases/cluster.redpanda.com_redpandas.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
Defines the version of the Redpanda Helm chart to deploy.
6060
Only charts in the v5.9.x and v5.10.x series are supported.
6161

62-
If unspecified, defaults to the operator's vendored chart version: `v5.9.21`.
62+
If unspecified, defaults to the operator's vendored chart version: `v5.10.1`.
6363

6464
It is recommended to leave this field unspecified.
6565
pattern: ^v?5\.(9|10)\.
@@ -131,7 +131,7 @@ spec:
131131
its internal Go-based Helm chart. FluxCD resources are still
132132
managed by the operator albeit in a suspended state.
133133

134-
If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The
134+
If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The
135135
operator does not reconcile any Redpanda resources that have `chartVersion` set to
136136
another version while `useFlux` is `false.
137137
type: boolean
@@ -20328,7 +20328,7 @@ spec:
2032820328
Defines the version of the Redpanda Helm chart to deploy.
2032920329
Only charts in the v5.9.x and v5.10.x series are supported.
2033020330

20331-
If unspecified, defaults to the operator's vendored chart version: `v5.9.21`.
20331+
If unspecified, defaults to the operator's vendored chart version: `v5.10.1`.
2033220332

2033320333
It is recommended to leave this field unspecified.
2033420334
pattern: ^v?5\.(9|10)\.
@@ -20400,7 +20400,7 @@ spec:
2040020400
its internal Go-based Helm chart. FluxCD resources are still
2040120401
managed by the operator albeit in a suspended state.
2040220402

20403-
If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The
20403+
If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The
2040420404
operator does not reconcile any Redpanda resources that have `chartVersion` set to
2040520405
another version while `useFlux` is `false.
2040620406
type: boolean

0 commit comments

Comments
 (0)