Skip to content

Commit c725376

Browse files
JakeSCahillchrissetomicheleRPpaulohtb6Deflaimun
authored
Backport K8s updates to v25.2 (#1502)
Co-authored-by: Chris Seto <[email protected]> Co-authored-by: Michele Cyran <[email protected]> Co-authored-by: Paulo Borges <[email protected]> Co-authored-by: Paulo Borges <[email protected]> Co-authored-by: Joyce Fee <[email protected]> Co-authored-by: Paulo Borges <[email protected]> Co-authored-by: Kat Batuigas <[email protected]> Co-authored-by: vbotbuildovich <[email protected]>
1 parent a348165 commit c725376

Some content is hidden

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

52 files changed

+2774
-1194
lines changed

.github/workflows/generate-crd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ jobs:
148148
# Convert the generated Markdown Helm documentation to AsciiDoc format using pandoc.
149149
- name: Convert Markdown to AsciiDoc
150150
run: |
151-
pandoc ./redpanda/charts/redpanda/README.md -t asciidoc -o ./redpanda-docs/modules/reference/pages/k-redpanda-helm-spec.adoc
152-
pandoc ./redpanda/charts/console/README.md -t asciidoc -o ./redpanda-docs/modules/reference/pages/k-console-helm-spec.adoc
151+
pandoc ./redpanda/charts/redpanda/chart/README.md -t asciidoc -o ./redpanda-docs/modules/reference/pages/k-redpanda-helm-spec.adoc
152+
pandoc ./redpanda/charts/console/chart/README.md -t asciidoc -o ./redpanda-docs/modules/reference/pages/k-console-helm-spec.adoc
153153
pandoc ./redpanda/operator/chart/README.md -t asciidoc -o ./redpanda-docs/modules/reference/pages/k-operator-helm-spec.adoc
154154
- name: Modify third-level headings format
155155
run: |

modules/ROOT/nav.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
** xref:deploy:redpanda/index.adoc[Redpanda]
6767
*** xref:deploy:redpanda/kubernetes/index.adoc[Kubernetes]
6868
**** xref:deploy:redpanda/kubernetes/k-deployment-overview.adoc[Overview]
69-
**** xref:deploy:redpanda/kubernetes/k-25.2-beta.adoc[Try v25.2]
7069
**** xref:deploy:redpanda/kubernetes/get-started-dev.adoc[Get Started]
7170
***** xref:deploy:redpanda/kubernetes/aks-guide.adoc[Azure AKS]
7271
***** xref:deploy:redpanda/kubernetes/eks-guide.adoc[Amazon EKS]
@@ -131,9 +130,10 @@
131130
**** xref:manage:kubernetes/security/tls/index.adoc[TLS Encryption]
132131
***** xref:manage:kubernetes/security/tls/k-cert-manager.adoc[Use cert-manager]
133132
***** xref:manage:kubernetes/security/tls/k-secrets.adoc[Use Secrets]
134-
**** xref:manage:kubernetes/security/authentication/index.adoc[Authentication]
133+
**** xref:manage:kubernetes/security/authentication/index.adoc[Authentication and Authorization]
135134
***** xref:manage:kubernetes/security/authentication/k-authentication.adoc[Enable Authentication]
136-
***** xref:manage:kubernetes/security/authentication/k-user-controller.adoc[Manage Users and ACLs]
135+
***** xref:manage:kubernetes/security/authentication/k-user-controller.adoc[Manage Users and ACLs (Operator)]
136+
***** xref:manage:kubernetes/security/authorization/k-role-controller.adoc[Manage Roles and ACLs (Operator)]
137137
**** xref:manage:kubernetes/security/k-audit-logging.adoc[Audit Logging]
138138
*** xref:manage:kubernetes/k-rack-awareness.adoc[Rack Awareness]
139139
*** xref:manage:kubernetes/k-remote-read-replicas.adoc[Remote Read Replicas]

modules/console/pages/config/analytics.adoc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,18 @@ When Redpanda Console is part of the Redpanda Helm chart or Operator:
7272
Operator::
7373
+
7474
[,yaml]
75-
.`redpanda-cluster`.yaml
75+
.`redpanda-console`.yaml
7676
----
7777
apiVersion: cluster.redpanda.com/v1alpha2
78-
kind: Redpanda
78+
kind: Console
7979
metadata:
80-
name: redpanda
80+
name: redpanda-console
8181
spec:
82-
clusterSpec:
83-
console:
84-
enabled: true
85-
console:
86-
config:
87-
analytics:
88-
enabled: false
82+
clusterRef:
83+
name: redpanda
84+
config:
85+
analytics:
86+
enabled: false
8987
----
9088

9189
Helm::

modules/console/pages/config/configure-console.adoc

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
:page-aliases: console:reference/config.adoc, reference:console/config.adoc
44
:page-context-switcher: [{"name": "Redpanda Console v2.x", "to": "24.3@ROOT:console:config/configure-console.adoc" },{"name": "Redpanda Console v3.x", "to": "current" } ]
55

6-
include::console:partial$operator-console-version-note.adoc[]
76

87
Redpanda Console loads configuration properties from three sources, in the following order of precedence:
98

@@ -79,35 +78,31 @@ Operator::
7978
Configure Redpanda Console in the `console` section of your Redpanda custom resource:
8079
+
8180
[,yaml]
82-
.`redpanda-cluster`.yaml
81+
.`redpanda-console`.yaml
8382
----
8483
apiVersion: cluster.redpanda.com/v1alpha2
85-
kind: Redpanda
84+
kind: Console
8685
metadata:
87-
name: redpanda
86+
name: redpanda-console
8887
spec:
89-
clusterSpec:
90-
console:
91-
enabled: true
92-
console:
93-
config:
94-
#kafka:
95-
#brokers: [] # Auto-configured to connect to this Redpanda cluster
96-
server:
97-
listenPort: 8080
98-
auditLog:
99-
enabled: false # default; set to true to write audit logs to stdout
100-
additionalHeaders: # specifies HTTP headers to include in audit logs
101-
- "X-Forwarded-For"
102-
- "User-Agent"
103-
# Add any other Redpanda Console configuration here
88+
clusterRef:
89+
name: redpanda # Reference to your Redpanda cluster
90+
config:
91+
server:
92+
listenPort: 8080
93+
auditLog:
94+
enabled: false
95+
additionalHeaders:
96+
- "X-Forwarded-For"
97+
- "User-Agent"
98+
# Add any other Redpanda Console configuration here
10499
----
105100
+
106101
Apply the configuration:
107102
+
108103
[,bash]
109104
----
110-
kubectl apply -f redpanda-cluster.yaml --namespace <namespace>
105+
kubectl apply -f redpanda-console.yaml --namespace <namespace>
111106
----
112107

113108
Helm::
@@ -122,7 +117,7 @@ console:
122117
console:
123118
config:
124119
#kafka:
125-
#brokers: [] # Auto-configured to connect to this Redpanda cluster
120+
#brokers: [] # You can leave this empty. The chart is already auto-configured to connect to your Redpanda cluster
126121
server:
127122
listenPort: 8080
128123
auditLog:

modules/console/pages/config/connect-to-redpanda.adoc

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
:description: Learn how to configure Redpanda Console to connect to a Redpanda cluster and ensure communication with your Redpanda brokers.
33
:page-context-switcher: [{"name": "Redpanda Console v2.x", "to": "24.3@ROOT:console:config/connect-to-redpanda.adoc" },{"name": "Redpanda Console v3.x", "to": "current" } ]
44

5-
include::console:partial$operator-console-version-note.adoc[]
65

76
Redpanda Console connects to your Redpanda cluster using dedicated configuration blocks for the Kafka API, Schema Registry API, and Admin API. Each connection serves a different purpose:
87

@@ -56,7 +55,21 @@ kafka:
5655
Kubernetes embedded::
5756
+
5857
--
59-
When Redpanda Console is deployed as part of the Redpanda Helm chart or Operator, no additional connection configuration is required. The chart or Operator automatically configures Redpanda Console to connect to the Redpanda cluster. Only configure the `kafka` block if you need to override the default connection settings (for example, to connect to a different cluster or use custom authentication).
58+
[tabs]
59+
====
60+
Operator::
61+
+
62+
When deploying Redpanda Console with the Redpanda Operator, you can connect Console to your Redpanda cluster in two ways:
63+
64+
- **clusterRef:** Reference the Redpanda cluster by name for automatic connection. This is the recommended approach for most users.
65+
- **staticConfiguration:** Manually specify connection details for Kafka, Admin API, and Schema Registry if you need custom settings.
66+
67+
The Operator will automatically configure Console to connect to the referenced cluster when using `clusterRef`. Use `staticConfiguration` only if you need to override the default connection or connect to a different cluster.
68+
69+
Helm chart::
70+
+
71+
Redpanda Console is automatically configured to connect to the Redpanda cluster managed by the Helm chart. No additional connection configuration is required. Only configure the `kafka` block if you need to override the default connection settings (for example, to connect to a different cluster or use custom authentication).
72+
====
6073
--
6174
Kubernetes standalone::
6275
+

0 commit comments

Comments
 (0)