diff --git a/assets/redpanda/redpanda-4.0.53.tgz b/assets/redpanda/redpanda-4.0.53.tgz new file mode 100644 index 000000000..79c8b45cc Binary files /dev/null and b/assets/redpanda/redpanda-4.0.53.tgz differ diff --git a/charts/redpanda/redpanda/Chart.lock b/charts/redpanda/redpanda/Chart.lock index d60e319ad..0605ea527 100644 --- a/charts/redpanda/redpanda/Chart.lock +++ b/charts/redpanda/redpanda/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://charts.redpanda.com version: 0.6.6 digest: sha256:af20a82c5cb646895892b783bdcfc50ca41f3f67ec14606c40236969c6a166e4 -generated: "2023-07-07T18:33:19.713747022Z" +generated: "2023-07-10T14:23:47.752683818Z" diff --git a/charts/redpanda/redpanda/Chart.yaml b/charts/redpanda/redpanda/Chart.yaml index b90b736b0..88ca1dcdb 100644 --- a/charts/redpanda/redpanda/Chart.yaml +++ b/charts/redpanda/redpanda/Chart.yaml @@ -33,4 +33,4 @@ name: redpanda sources: - https://github.com/redpanda-data/helm-charts type: application -version: 4.0.52 +version: 4.0.53 diff --git a/charts/redpanda/redpanda/templates/service.loadbalancer.yaml b/charts/redpanda/redpanda/templates/service.loadbalancer.yaml index 3147aaf0d..5c622ca2c 100644 --- a/charts/redpanda/redpanda/templates/service.loadbalancer.yaml +++ b/charts/redpanda/redpanda/templates/service.loadbalancer.yaml @@ -16,79 +16,84 @@ limitations under the License. */}} {{- if (include "external-loadbalancer-enabled" . | fromJson).bool }} {{- $values := .Values }} - {{- $root := . -}} + {{- $root := . }} + {{- $addresses := dig "addresses" list $values.external }} {{- range $replicaIndex := untilStep 0 ($values.statefulset.replicas|int) 1 }} + {{- $podName := printf "%s-%d" (include "redpanda.fullname" $root) $replicaIndex }} + {{- $address := printf "%s.%s" $podName (tpl $values.external.domain $) }} + {{- if ge (len $addresses) (add $replicaIndex 1) }} + {{- $address = printf "%s.%s" (default $podName (index $addresses $replicaIndex)) (tpl $values.external.domain $) }} + {{- end }} --- apiVersion: v1 kind: Service metadata: - name: lb-{{ include "redpanda.fullname" $root }}-{{ $replicaIndex }} - namespace: {{ $root.Release.Namespace | quote }} + name: lb-{{ $podName }} + namespace: {{ $root.Release.Namespace }} labels: -{{- with include "full.labels" $root }} - {{- . | nindent 4 }} -{{- end }} + {{- with include "full.labels" $root }} + {{- . | nindent 4 }} + {{- end }} repdanda.com/type: "loadbalancer" -{{- if (or $values.external.annotations (dig "externalDns" "enabled" false $values.external) ) }} + {{- if (or $values.external.annotations (dig "externalDns" "enabled" false $values.external) ) }} annotations: -{{- with $values.external.annotations }} - {{- toYaml . | nindent 4 }} -{{- end }} -{{- if (dig "externalDns" "enabled" false $values.external) }} - {{ printf "external-dns.alpha.kubernetes.io/hostname: %s.%s" (index $values.external.addresses $replicaIndex) (tpl $values.external.domain $) }} -{{- end }} -{{- end }} + {{- with $values.external.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- if (dig "externalDns" "enabled" false $values.external) }} + {{- printf "external-dns.alpha.kubernetes.io/hostname: %s" $address | nindent 4}} + {{- end }} + {{- end }} spec: type: LoadBalancer publishNotReadyAddresses: true -{{- if not ( empty $root.Values.external.sourceRanges ) }} + {{- with $root.Values.external.sourceRanges }} loadBalancerSourceRanges: - {{- range $values.external.sourceRanges }} - - {{ . }} - {{- end }} -{{- end }} + {{- toYaml $values.external.sourceRanges | nindent 4}} + {{- end }} externalTrafficPolicy: Local sessionAffinity: None ports: -{{- range $name, $listener := $values.listeners.admin.external }} - {{- $enabled := dig "enabled" $values.external.enabled $listener }} - {{- if $enabled }} + {{- range $name, $listener := $values.listeners.admin.external }} + {{- $enabled := dig "enabled" $values.external.enabled $listener }} + {{- if $enabled }} - name: admin-{{ $name }} protocol: TCP targetPort: {{ $values.listeners.admin.port }} port: {{ dig "nodePort" (first (dig "advertisedPorts" (list $values.listeners.admin.port) $listener)) $listener }} - {{- end }} -{{- end }} -{{- range $name, $listener := $values.listeners.kafka.external }} - {{- $enabled := dig "enabled" $values.external.enabled $listener }} - {{- if $enabled }} + {{- end }} + {{- end }} + {{- range $name, $listener := $values.listeners.kafka.external }} + {{- $enabled := dig "enabled" $values.external.enabled $listener }} + {{- if $enabled }} - name: kafka-{{ $name }} protocol: TCP targetPort: {{ $listener.port }} port: {{ dig "nodePort" (first (dig "advertisedPorts" (list $listener.port) $listener)) $listener }} - {{- end }} -{{- end }} -{{- range $name, $listener := $values.listeners.http.external }} - {{- $enabled := dig "enabled" $values.external.enabled $listener }} - {{- if $enabled }} + {{- end }} + {{- end }} + {{- range $name, $listener := $values.listeners.http.external }} + {{- $enabled := dig "enabled" $values.external.enabled $listener }} + {{- if $enabled }} - name: http-{{ $name }} protocol: TCP targetPort: {{ $listener.port }} port: {{ dig "nodePort" (first (dig "advertisedPorts" (list $listener.port) $listener)) $listener }} - {{- end }} -{{- end }} -{{- range $name, $listener := $values.listeners.schemaRegistry.external }} - {{- $enabled := dig "enabled" $values.external.enabled $listener }} - {{- if $enabled }} + {{- end }} + {{- end }} + {{- range $name, $listener := $values.listeners.schemaRegistry.external }} + {{- $enabled := dig "enabled" $values.external.enabled $listener }} + {{- if $enabled }} - name: schema-{{ $name }} protocol: TCP targetPort: {{ $listener.port }} port: {{ dig "nodePort" (first (dig "advertisedPorts" (list $listener.port) $listener)) $listener }} - {{- end }} -{{- end }} + {{- end }} + {{- end }} selector: app.kubernetes.io/name: {{ template "redpanda.name" $root }} - app.kubernetes.io/instance: {{ $root.Release.Name | quote }} - statefulset.kubernetes.io/pod-name: {{ include "redpanda.fullname" $root }}-{{ $replicaIndex }} + app.kubernetes.io/instance: {{ $root.Release.Name }} + statefulset.kubernetes.io/pod-name: {{ $podName }} {{- end }} {{- end }} + diff --git a/index.yaml b/index.yaml index 63eaeaed8..8298cf881 100644 --- a/index.yaml +++ b/index.yaml @@ -35891,6 +35891,46 @@ entries: - assets/bitnami/redis-17.3.7.tgz version: 17.3.7 redpanda: + - annotations: + artifacthub.io/images: | + - name: redpanda + image: docker.redpanda.com/redpandadata/redpanda:v23.1.13 + - name: busybox + image: busybox:latest + - name: mintel/docker-alpine-bash-curl-jq + image: mintel/docker-alpine-bash-curl-jq:latest + artifacthub.io/license: Apache-2.0 + artifacthub.io/links: | + - name: Documentation + url: https://docs.redpanda.com + - name: "Helm (>= 3.6.0)" + url: https://helm.sh/docs/intro/install/ + catalog.cattle.io/certified: partner + catalog.cattle.io/display-name: Redpanda + catalog.cattle.io/kube-version: '>=1.21-0' + catalog.cattle.io/release-name: redpanda + apiVersion: v2 + appVersion: v23.1.13 + created: "2023-07-10T16:58:10.004509685Z" + dependencies: + - condition: console.enabled + name: console + repository: file://./charts/console + version: '>=0.5 <1.0' + description: Redpanda is the real-time engine for modern apps. + digest: e805057d7954778f9a3c9686c6cbcdad4c6fd4714e1111cd3dff8a68e188ada1 + icon: https://images.ctfassets.net/paqvtpyf8rwu/3cYHw5UzhXCbKuR24GDFGO/73fb682e6157d11c10d5b2b5da1d5af0/skate-stand-panda.svg + kubeVersion: '>=1.21-0' + maintainers: + - name: redpanda-data + url: https://github.com/orgs/redpanda-data/people + name: redpanda + sources: + - https://github.com/redpanda-data/helm-charts + type: application + urls: + - assets/redpanda/redpanda-4.0.53.tgz + version: 4.0.53 - annotations: artifacthub.io/images: | - name: redpanda