Skip to content

Update redpanda version for operator release #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewstucki merged 1 commit into from
Apr 8, 2025
Merged

Update redpanda version for operator release #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 20 additions & 19 deletions licenses/third_party.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ run `task generate:third-party-licenses-list`
| :----------: | :------------: |
| buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate | [Apache-2.0](https://github.com/bufbuild/protovalidate/blob/main/LICENSE) |
| 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) |
| cloud.google.com/go/auth | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/v0.7.2/auth/LICENSE) |
| 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) |
| cloud.google.com/go/auth | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/auth/v0.9.3/auth/LICENSE) |
| 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) |
| 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) |
| cloud.google.com/go/iam | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/iam/v1.1.11/iam/LICENSE) |
| cloud.google.com/go/internal | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/v0.115.0/LICENSE) |
| cloud.google.com/go/storage | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/storage/v1.42.0/storage/LICENSE) |
| cloud.google.com/go/iam | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/iam/v1.2.1/iam/LICENSE) |
| cloud.google.com/go/internal | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/v0.116.0/LICENSE) |
| cloud.google.com/go/storage | [Apache-2.0](https://github.com/googleapis/google-cloud-go/blob/storage/v1.43.0/storage/LICENSE) |
| connectrpc.com/connect | [Apache-2.0](https://github.com/connectrpc/connect-go/blob/v1.16.2/LICENSE) |
| dario.cat/mergo | [BSD-3-Clause](https://github.com/imdario/mergo/blob/v1.0.1/LICENSE) |
| emperror.dev/errors | [MIT](https://github.com/emperror/errors/blob/v0.8.1/LICENSE) |
Expand Down Expand Up @@ -171,6 +171,7 @@ run `task generate:third-party-licenses-list`
| github.com/go-openapi/strfmt | [Apache-2.0](https://github.com/go-openapi/strfmt/blob/v0.21.9/LICENSE) |
| github.com/go-openapi/swag | [Apache-2.0](https://github.com/go-openapi/swag/blob/v0.23.0/LICENSE) |
| github.com/go-openapi/validate | [Apache-2.0](https://github.com/go-openapi/validate/blob/v0.22.3/LICENSE) |
| github.com/go-viper/mapstructure/v2 | [MIT](https://github.com/go-viper/mapstructure/blob/v2.2.1/LICENSE) |
| github.com/gobwas/glob | [MIT](https://github.com/gobwas/glob/blob/v0.2.3/LICENSE) |
| github.com/gogo/protobuf | [BSD-3-Clause](https://github.com/gogo/protobuf/blob/v1.3.2/LICENSE) |
| github.com/golang-jwt/jwt/v4 | [MIT](https://github.com/golang-jwt/jwt/blob/v4.5.0/LICENSE) |
Expand All @@ -195,10 +196,10 @@ run `task generate:third-party-licenses-list`
| github.com/google/go-github/v55/github | [BSD-3-Clause](https://github.com/google/go-github/blob/v55.0.0/LICENSE) |
| github.com/google/go-querystring/query | [BSD-3-Clause](https://github.com/google/go-querystring/blob/v1.1.0/LICENSE) |
| github.com/google/gofuzz | [Apache-2.0](https://github.com/google/gofuzz/blob/v1.2.0/LICENSE) |
| github.com/google/s2a-go | [Apache-2.0](https://github.com/google/s2a-go/blob/v0.1.7/LICENSE.md) |
| github.com/google/s2a-go | [Apache-2.0](https://github.com/google/s2a-go/blob/v0.1.8/LICENSE.md) |
| github.com/google/shlex | [Apache-2.0](https://github.com/google/shlex/blob/e7afc7fbc510/COPYING) |
| github.com/google/uuid | [BSD-3-Clause](https://github.com/google/uuid/blob/v1.6.0/LICENSE) |
| github.com/googleapis/enterprise-certificate-proxy/client | [Apache-2.0](https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.2/LICENSE) |
| github.com/googleapis/enterprise-certificate-proxy/client | [Apache-2.0](https://github.com/googleapis/enterprise-certificate-proxy/blob/v0.3.4/LICENSE) |
| github.com/googleapis/gax-go/v2 | [BSD-3-Clause](https://github.com/googleapis/gax-go/blob/v2.13.0/v2/LICENSE) |
| github.com/gorilla/mux | [BSD-3-Clause](https://github.com/gorilla/mux/blob/v1.8.1/LICENSE) |
| github.com/gorilla/websocket | [BSD-2-Clause](https://github.com/gorilla/websocket/blob/v1.5.0/LICENSE) |
Expand Down Expand Up @@ -361,14 +362,14 @@ run `task generate:third-party-licenses-list`
| github.com/zeebo/blake3 | [CC0-1.0](https://github.com/zeebo/blake3/blob/v0.2.3/LICENSE) |
| go.mongodb.org/mongo-driver | [Apache-2.0](https://github.com/mongodb/mongo-go-driver/blob/v1.13.1/LICENSE) |
| go.opencensus.io | [Apache-2.0](https://github.com/census-instrumentation/opencensus-go/blob/v0.24.0/LICENSE) |
| 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) |
| 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) |
| go.opentelemetry.io/otel | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/v1.28.0/LICENSE) |
| 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) |
| 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) |
| go.opentelemetry.io/otel | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/v1.29.0/LICENSE) |
| 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) |
| 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) |
| go.opentelemetry.io/otel/metric | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.28.0/metric/LICENSE) |
| go.opentelemetry.io/otel/metric | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/metric/v1.29.0/metric/LICENSE) |
| go.opentelemetry.io/otel/sdk | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/sdk/v1.28.0/sdk/LICENSE) |
| go.opentelemetry.io/otel/trace | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.28.0/trace/LICENSE) |
| go.opentelemetry.io/otel/trace | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-go/blob/trace/v1.29.0/trace/LICENSE) |
| go.opentelemetry.io/proto/otlp | [Apache-2.0](https://github.com/open-telemetry/opentelemetry-proto-go/blob/otlp/v1.1.0/otlp/LICENSE) |
| go.starlark.net | [BSD-3-Clause](https://github.com/google/starlark-go/blob/90ade8b19d09/LICENSE) |
| go.step.sm/crypto | [Apache-2.0](https://github.com/smallstep/crypto/blob/v0.40.0/LICENSE) |
Expand All @@ -379,20 +380,20 @@ run `task generate:third-party-licenses-list`
| golang.org/x/exp | [BSD-3-Clause](https://cs.opensource.google/go/x/exp/+/e7e105de:LICENSE) |
| golang.org/x/mod | [BSD-3-Clause](https://cs.opensource.google/go/x/mod/+/v0.22.0:LICENSE) |
| golang.org/x/net | [BSD-3-Clause](https://cs.opensource.google/go/x/net/+/v0.38.0:LICENSE) |
| golang.org/x/oauth2 | [BSD-3-Clause](https://cs.opensource.google/go/x/oauth2/+/v0.23.0:LICENSE) |
| golang.org/x/oauth2 | [BSD-3-Clause](https://cs.opensource.google/go/x/oauth2/+/v0.28.0:LICENSE) |
| golang.org/x/sync | [BSD-3-Clause](https://cs.opensource.google/go/x/sync/+/v0.12.0:LICENSE) |
| golang.org/x/sys | [BSD-3-Clause](https://cs.opensource.google/go/x/sys/+/v0.31.0:LICENSE) |
| golang.org/x/term | [BSD-3-Clause](https://cs.opensource.google/go/x/term/+/v0.30.0:LICENSE) |
| golang.org/x/text | [BSD-3-Clause](https://cs.opensource.google/go/x/text/+/v0.23.0:LICENSE) |
| golang.org/x/time/rate | [BSD-3-Clause](https://cs.opensource.google/go/x/time/+/v0.7.0:LICENSE) |
| golang.org/x/tools | [BSD-3-Clause](https://cs.opensource.google/go/x/tools/+/v0.29.0:LICENSE) |
| gomodules.xyz/jsonpatch/v2 | [Apache-2.0](https://github.com/gomodules/jsonpatch/blob/v2.4.0/v2/LICENSE) |
| google.golang.org/api | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.189.0/LICENSE) |
| 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) |
| google.golang.org/genproto/googleapis/api | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/93522f1f2a9f/googleapis/api/LICENSE) |
| google.golang.org/genproto/googleapis/rpc | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/573a1156607a/googleapis/rpc/LICENSE) |
| google.golang.org/genproto/googleapis/type | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/93522f1f2a9f/LICENSE) |
| google.golang.org/grpc | [Apache-2.0](https://github.com/grpc/grpc-go/blob/v1.65.0/LICENSE) |
| google.golang.org/api | [BSD-3-Clause](https://github.com/googleapis/google-api-go-client/blob/v0.197.0/LICENSE) |
| 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) |
| google.golang.org/genproto/googleapis/api | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/5fefd90f89a9/googleapis/api/LICENSE) |
| google.golang.org/genproto/googleapis/rpc | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/796eee8c2d53/googleapis/rpc/LICENSE) |
| google.golang.org/genproto/googleapis/type | [Apache-2.0](https://github.com/googleapis/go-genproto/blob/796eee8c2d53/LICENSE) |
| google.golang.org/grpc | [Apache-2.0](https://github.com/grpc/grpc-go/blob/v1.67.1/LICENSE) |
| google.golang.org/protobuf | [BSD-3-Clause](https://github.com/protocolbuffers/protobuf-go/blob/v1.35.1/LICENSE) |
| gopkg.in/evanphx/json-patch.v5 | [BSD-3-Clause](https://github.com/evanphx/json-patch/blob/v5.7.0/LICENSE) |
| gopkg.in/go-jose/go-jose.v2 | [Apache-2.0](https://github.com/go-jose/go-jose/blob/v2.6.2/LICENSE) |
Expand Down
9 changes: 4 additions & 5 deletions operator/api/redpanda/v1alpha2/redpanda_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ import (
"k8s.io/utils/ptr"

redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
"github.com/redpanda-data/redpanda-operator/pkg/gotohelm/helmette"
"github.com/redpanda-data/redpanda-operator/pkg/kube"
)

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

return redpandachart.Chart.Dot(ptr.To(kube.RestToConfig(restConfig)), release, partial)
return redpandachart.Chart.Dot(restConfig, release, partial)
}
4 changes: 2 additions & 2 deletions operator/api/redpanda/v1alpha2/testdata/crd-docs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ Certificate configures TLS certificates.
Only charts in the v5.9.x and v5.10.x series are supported. +


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


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


If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The +
If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The +
operator does not reconcile any Redpanda resources that have `chartVersion` set to +
another version while `useFlux` is `false. + | |
|===
Expand Down
3 changes: 1 addition & 2 deletions operator/cmd/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import (
consolepkg "github.com/redpanda-data/redpanda-operator/operator/pkg/console"
"github.com/redpanda-data/redpanda-operator/operator/pkg/resources"
redpandawebhooks "github.com/redpanda-data/redpanda-operator/operator/webhooks/redpanda"
"github.com/redpanda-data/redpanda-operator/pkg/kube"
)

type RedpandaController string
Expand Down Expand Up @@ -559,7 +558,7 @@ func Run(

// Redpanda Reconciler
if err = (&redpandacontrollers.RedpandaReconciler{
KubeConfig: kube.RestToConfig(mgr.GetConfig()),
KubeConfig: mgr.GetConfig(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
EventRecorder: mgr.GetEventRecorderFor("RedpandaReconciler"),
Expand Down
8 changes: 4 additions & 4 deletions operator/config/crd/bases/cluster.redpanda.com_redpandas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
Defines the version of the Redpanda Helm chart to deploy.
Only charts in the v5.9.x and v5.10.x series are supported.

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

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

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

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

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

If `false`, `chartVersion` MUST be `v5.9.21` or unspecified. The
If `false`, `chartVersion` MUST be `v5.10.1` or unspecified. The
operator does not reconcile any Redpanda resources that have `chartVersion` set to
another version while `useFlux` is `false.
type: boolean
Expand Down
Loading
Loading