Skip to content

Commit 655bb13

Browse files
RafalKoreptachrisseto
RafalKorepta
authored and
chrisseto
committed
sync: operator v2.4.1
Reference redpanda-data/redpanda-operator#683
1 parent b4bb47e commit 655bb13

30 files changed

+144
-481
lines changed

‎Taskfile.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ tasks:
184184
sync:operator:chart:
185185
- task: sync:chart
186186
vars:
187-
REF: e92ffb8a05a6a35011a24bcda65c094cc6464187 # operator v0.4.41
187+
REF: d22c033b9e7989ae471c052f1536b97242f8b539 # operator/v2.4.1 with chart specific fixes.
188188
LOCAL_DIR: charts/operator
189-
REMOTE_DIR: charts/operator
189+
REMOTE_DIR: operator/chart
190190

191191
sync:console:chart:
192192
- task: sync:chart
@@ -208,6 +208,7 @@ tasks:
208208
- rm -rf '{{ .SRC_DIR }}/{{ .LOCAL_DIR }}'
209209
- mkdir -p '{{ .SRC_DIR }}/{{ .LOCAL_DIR }}'
210210
- |
211+
cd {{ .LOCAL_DIR }} && \
211212
curl -Lo - 'https://github.com/redpanda-data/redpanda-operator/archive/{{ .REF }}.tar.gz' | \
212213
tar \
213214
--gunzip \
@@ -218,5 +219,5 @@ tasks:
218219
--exclude 'go.sum' \
219220
--exclude '*.txtar' \
220221
--exclude '.changes' \
221-
--strip-components 1 \
222+
--strip-components {{ (.REMOTE_DIR | split "/" | len) | add 1 }} \
222223
'*/{{ .REMOTE_DIR }}'

‎charts/operator/CHANGELOG.md‎

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

‎charts/operator/Chart.yaml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,19 @@ name: operator
33
description: Redpanda operator helm chart
44
type: application
55

6-
# The chart version and the app version are not the same and will not track
7-
# together. The chart version is a semver representation of changes to this
8-
# chart.
9-
version: 0.4.40
10-
11-
# This is the default version of the operator being deployed.
12-
# ** NOTE for maintainers: please enssure the artifacthub image annotation is updated before merging
13-
appVersion: v2.3.8-24.3.6
14-
6+
# The operator helm chart is considered part of the operator itself. Therefore
7+
# version == appVersion.
8+
version: v2.4.1
9+
appVersion: v2.4.1
1510
kubeVersion: ">= 1.25.0-0"
1611

1712
sources:
18-
- https://github.com/redpanda-data/redpanda-operator/tree/main/charts/operator
13+
- https://github.com/redpanda-data/redpanda-operator/tree/main/operator/chart
1914
icon: https://go.redpanda.com/hubfs/Redpandas/operator-panda.png
2015
maintainers:
2116
- name: redpanda-data
2217
url: https://github.com/orgs/redpanda-data/people
2318

24-
dependencies:
25-
- name: kube-prometheus-stack
26-
condition: monitoring.deployPrometheusKubeStack
27-
version: 51.2.0
28-
repository: https://prometheus-community.github.io/helm-charts
29-
3019
annotations:
3120
artifacthub.io/license: Apache-2.0
3221
artifacthub.io/links: |
@@ -36,13 +25,9 @@ annotations:
3625
url: https://helm.sh/docs/intro/install/
3726
artifacthub.io/images: |
3827
- name: redpanda-operator
39-
image: docker.redpanda.com/redpandadata/redpanda-operator:v2.3.8-24.3.6
40-
- name: configurator
41-
image: docker.redpanda.com/redpandadata/configurator:v2.3.8-24.3.6
28+
image: docker.redpanda.com/redpandadata/redpanda-operator:v2.4.1
4229
- name: redpanda
43-
image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
44-
- name: kube-rbac-proxy
45-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.0
30+
image: docker.redpanda.com/redpandadata/redpanda:v25.1.1
4631
artifacthub.io/crds: |
4732
- kind: Redpanda
4833
version: v1alpha1

‎charts/operator/README.md‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
description: Find the default values and descriptions of settings in the Redpanda Operator Helm chart.
44
---
55

6-
![Version: 0.4.40](https://img.shields.io/badge/Version-0.4.40-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.8-24.3.6](https://img.shields.io/badge/AppVersion-v2.3.8--24.3.6-informational?style=flat-square)
6+
![Version: v2.4.1](https://img.shields.io/badge/Version-v2.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.4.1](https://img.shields.io/badge/AppVersion-v2.4.1-informational?style=flat-square)
77

8-
This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/operator/values.yaml). Each of the settings is listed and described on this page, along with any default values.
8+
This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](./values.yaml). Each of the settings is listed and described on this page, along with any default values.
99

1010
For instructions on how to install and use the chart, including how to override and customize the chart’s values, refer to the [deployment documentation](https://docs.redpanda.com/docs/deploy/deployment-option/self-hosted/kubernetes/kubernetes-deploy/).
1111

@@ -14,27 +14,19 @@ Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/n
1414

1515
## Source Code
1616

17-
* <https://github.com/redpanda-data/redpanda-operator/tree/main/charts/operator>
17+
* <https://github.com/redpanda-data/redpanda-operator/tree/main/operator/chart>
1818

1919
## Requirements
2020

2121
Kubernetes: `>= 1.25.0-0`
2222

23-
| Repository | Name | Version |
24-
|------------|------|---------|
25-
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 51.2.0 |
26-
2723
## Settings
2824

2925
### [additionalCmdFlags](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=additionalCmdFlags)
3026

3127
Passes additional flags to the Redpanda Operator at startup. Additional flags include: - `--additional-controllers`: Additional controllers to deploy. Valid values are nodeWatcher or decommission. For more information about the Nodewatcher controller, see [Install the Nodewatcher controller](https://docs.redpanda.com/current/manage/kubernetes/k-scale-redpanda/#node-pvc). For more information about the Decommission controller, see [Use the Decommission controller](https://docs.redpanda.com/current/manage/kubernetes/k-decommission-brokers/#Automated).
3228

33-
**Default:**
34-
35-
```
36-
["--configurator-tag=v2.3.6-24.3.3"]
37-
```
29+
**Default:** `[]`
3830

3931
### [affinity](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=affinity)
4032

@@ -226,17 +218,7 @@ Log level Valid values (from least to most verbose) are: `warn`, `info`, `debug`
226218

227219
Configuration for monitoring.
228220

229-
**Default:**
230-
231-
```
232-
{"deployPrometheusKubeStack":false,"enabled":false}
233-
```
234-
235-
### [monitoring.deployPrometheusKubeStack](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=monitoring.deployPrometheusKubeStack)
236-
237-
Deploys the [Prometheus community Helm chart](https://prometheus-community.github.io/helm-charts/).
238-
239-
**Default:** `false`
221+
**Default:** `{"enabled":false}`
240222

241223
### [monitoring.enabled](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=monitoring.enabled)
242224

@@ -258,8 +240,6 @@ Node selection constraints for scheduling Pods on specific nodes. For details, s
258240

259241
### [podAnnotations](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=podAnnotations)
260242

261-
Sets deployment strategy. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy). strategy: "" Sets additional annotations for Pods.
262-
263243
**Default:** `{}`
264244

265245
### [podLabels](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=podLabels)
@@ -354,6 +334,12 @@ Specifies whether a service account should be created.
354334

355335
**Default:** `true`
356336

337+
### [strategy](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=strategy)
338+
339+
Sets deployment strategy. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy).
340+
341+
**Default:** `{"type":"RollingUpdate"}`
342+
357343
### [tolerations](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=tolerations)
358344

359345
Taints to be tolerated by Pods. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/).

‎charts/operator/README.md.gotmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Find the default values and descriptions of settings in the Redpand
66
{{- end -}}
77

88
{{ define "chart.description" -}}
9-
This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/operator/values.yaml). Each of the settings is listed and described on this page, along with any default values.
9+
This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](./values.yaml). Each of the settings is listed and described on this page, along with any default values.
1010

1111
For instructions on how to install and use the chart, including how to override and customize the chart’s values, refer to the [deployment documentation](https://docs.redpanda.com/docs/deploy/deployment-option/self-hosted/kubernetes/kubernetes-deploy/).
1212
{{ end -}}

‎charts/operator/files/three_node_cluster.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: cluster-tls
66
spec:
77
image: "docker.redpanda.com/redpandadata/redpanda"
8-
version: "v24.2.1"
8+
version: "v25.1.1"
99
replicas: 3
1010
resources:
1111
requests:
@@ -26,4 +26,4 @@ spec:
2626
- port: 9644
2727
pandaproxyApi:
2828
- port: 8082
29-
developerMode: true
29+
developerMode: true

‎charts/operator/files/three_node_redpanda.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ kind: Redpanda
33
metadata:
44
name: cluster-tls
55
spec:
6-
chartRef:
7-
chartVersion: ">4.0.0"
86
clusterSpec:
97
console:
108
enabled: false
119
image:
1210
repository: docker.redpanda.com/redpandadata/redpanda
13-
tag: v24.2.1
11+
tag: v25.1.1
1412
listeners:
1513
admin:
1614
external: {}

‎charts/operator/templates/_certificates.go.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{- break -}}
1212
{{- end -}}
1313
{{- $_is_returning = true -}}
14-
{{- (dict "r" (mustMergeOverwrite (dict "metadata" (dict "creationTimestamp" (coalesce nil) ) "spec" (dict "secretName" "" "issuerRef" (dict "name" "" ) ) "status" (dict ) ) (mustMergeOverwrite (dict ) (dict "apiVersion" "cert-manager.io/v1" "kind" "Certificate" )) (dict "metadata" (mustMergeOverwrite (dict "creationTimestamp" (coalesce nil) ) (dict "name" "redpanda-serving-cert" "namespace" $dot.Release.Namespace "labels" (get (fromJson (include "operator.Labels" (dict "a" (list $dot) ))) "r") "annotations" $values.annotations )) "spec" (mustMergeOverwrite (dict "secretName" "" "issuerRef" (dict "name" "" ) ) (dict "dnsNames" (list (printf "%s-webhook-service.%s.svc" (get (fromJson (include "operator.RedpandaOperatorName" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace) (printf "%s-webhook-service.%s.svc.%s" (get (fromJson (include "operator.RedpandaOperatorName" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace $values.clusterDomain)) "issuerRef" (mustMergeOverwrite (dict "name" "" ) (dict "kind" "Issuer" "name" (get (fromJson (include "operator.cleanForK8sWithSuffix" (dict "a" (list (get (fromJson (include "operator.Fullname" (dict "a" (list $dot) ))) "r") "selfsigned-issuer") ))) "r") )) "secretName" $values.webhookSecretName "privateKey" (mustMergeOverwrite (dict ) (dict "rotationPolicy" "Never" )) )) ))) | toJson -}}
14+
{{- (dict "r" (mustMergeOverwrite (dict "metadata" (dict "creationTimestamp" (coalesce nil) ) "spec" (dict "secretName" "" "issuerRef" (dict "name" "" ) ) "status" (dict ) ) (mustMergeOverwrite (dict ) (dict "apiVersion" "cert-manager.io/v1" "kind" "Certificate" )) (dict "metadata" (mustMergeOverwrite (dict "creationTimestamp" (coalesce nil) ) (dict "name" "redpanda-serving-cert" "namespace" $dot.Release.Namespace "labels" (get (fromJson (include "operator.Labels" (dict "a" (list $dot) ))) "r") "annotations" $values.annotations )) "spec" (mustMergeOverwrite (dict "secretName" "" "issuerRef" (dict "name" "" ) ) (dict "dnsNames" (list (printf "%s-webhook-service.%s.svc" (get (fromJson (include "operator.Name" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace) (printf "%s-webhook-service.%s.svc.%s" (get (fromJson (include "operator.Name" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace $values.clusterDomain)) "issuerRef" (mustMergeOverwrite (dict "name" "" ) (dict "kind" "Issuer" "name" (get (fromJson (include "operator.cleanForK8sWithSuffix" (dict "a" (list (get (fromJson (include "operator.Fullname" (dict "a" (list $dot) ))) "r") "selfsigned-issuer") ))) "r") )) "secretName" $values.webhookSecretName "privateKey" (mustMergeOverwrite (dict ) (dict "rotationPolicy" "Never" )) )) ))) | toJson -}}
1515
{{- break -}}
1616
{{- end -}}
1717
{{- end -}}

‎charts/operator/templates/_chart.go.tpl‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{{- /* Generated from "chart.go" */ -}}
2+
3+
{{- define "operator.render" -}}
4+
{{- $dot := (index .a 0) -}}
5+
{{- range $_ := (list 1) -}}
6+
{{- $_is_returning := false -}}
7+
{{- $manifests := (list (get (fromJson (include "operator.Issuer" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.Certificate" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.ConfigMap" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.MetricsService" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.WebhookService" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.MutatingWebhookConfiguration" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.ValidatingWebhookConfiguration" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.ServiceAccount" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.ServiceMonitor" (dict "a" (list $dot) ))) "r") (get (fromJson (include "operator.Deployment" (dict "a" (list $dot) ))) "r")) -}}
8+
{{- range $_, $role := (get (fromJson (include "operator.Roles" (dict "a" (list $dot) ))) "r") -}}
9+
{{- $manifests = (concat (default (list ) $manifests) (list $role)) -}}
10+
{{- end -}}
11+
{{- if $_is_returning -}}
12+
{{- break -}}
13+
{{- end -}}
14+
{{- range $_, $cr := (get (fromJson (include "operator.ClusterRoles" (dict "a" (list $dot) ))) "r") -}}
15+
{{- $manifests = (concat (default (list ) $manifests) (list $cr)) -}}
16+
{{- end -}}
17+
{{- if $_is_returning -}}
18+
{{- break -}}
19+
{{- end -}}
20+
{{- range $_, $rb := (get (fromJson (include "operator.RoleBindings" (dict "a" (list $dot) ))) "r") -}}
21+
{{- $manifests = (concat (default (list ) $manifests) (list $rb)) -}}
22+
{{- end -}}
23+
{{- if $_is_returning -}}
24+
{{- break -}}
25+
{{- end -}}
26+
{{- range $_, $crb := (get (fromJson (include "operator.ClusterRoleBindings" (dict "a" (list $dot) ))) "r") -}}
27+
{{- $manifests = (concat (default (list ) $manifests) (list $crb)) -}}
28+
{{- end -}}
29+
{{- if $_is_returning -}}
30+
{{- break -}}
31+
{{- end -}}
32+
{{- $_is_returning = true -}}
33+
{{- (dict "r" $manifests) | toJson -}}
34+
{{- break -}}
35+
{{- end -}}
36+
{{- end -}}
37+

0 commit comments

Comments
 (0)