This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 0e3251b Remove deprecated "extra" key to configure components, also
remove dashboard that has been replaced (#461)
0e3251b is described below
commit 0e3251bea8f0af84c4fee043bb6f68183ac4a932
Author: Lari Hotari <[email protected]>
AuthorDate: Wed Feb 21 14:53:29 2024 +0200
Remove deprecated "extra" key to configure components, also remove
dashboard that has been replaced (#461)
- the "extra" key has been deprecated a long time ago
- the dashboard is outdated and there's a replacement with
kube-prometheus-stack and #439
---
.../pulsar/templates/autorecovery-configmap.yaml | 2 +-
.../templates/autorecovery-service-account.yaml | 2 +-
charts/pulsar/templates/autorecovery-service.yaml | 2 +-
.../pulsar/templates/autorecovery-statefulset.yaml | 2 +-
charts/pulsar/templates/broker-configmap.yaml | 4 +-
charts/pulsar/templates/broker-rbac.yaml | 2 +-
.../pulsar/templates/broker-service-account.yaml | 2 +-
charts/pulsar/templates/dashboard-deployment.yaml | 67 ---------------------
charts/pulsar/templates/dashboard-ingress.yaml | 68 ----------------------
charts/pulsar/templates/dashboard-service.yaml | 38 ------------
charts/pulsar/templates/proxy-configmap.yaml | 2 +-
charts/pulsar/templates/proxy-pdb.yaml | 2 +-
charts/pulsar/templates/proxy-service.yaml | 2 +-
charts/pulsar/templates/proxy-statefulset.yaml | 2 +-
.../templates/pulsar-manager-admin-secret.yaml | 2 +-
.../pulsar-manager-cluster-initialize.yaml | 2 +-
.../pulsar/templates/pulsar-manager-configmap.yaml | 2 +-
.../pulsar/templates/pulsar-manager-service.yaml | 2 +-
.../templates/pulsar-manager-statefulset.yaml | 2 +-
charts/pulsar/values.yaml | 59 -------------------
20 files changed, 17 insertions(+), 249 deletions(-)
diff --git a/charts/pulsar/templates/autorecovery-configmap.yaml
b/charts/pulsar/templates/autorecovery-configmap.yaml
index 65cd644..18395c2 100644
--- a/charts/pulsar/templates/autorecovery-configmap.yaml
+++ b/charts/pulsar/templates/autorecovery-configmap.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
+{{- if .Values.components.autorecovery }}
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/charts/pulsar/templates/autorecovery-service-account.yaml
b/charts/pulsar/templates/autorecovery-service-account.yaml
index 56da030..bbb66bb 100644
--- a/charts/pulsar/templates/autorecovery-service-account.yaml
+++ b/charts/pulsar/templates/autorecovery-service-account.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
+{{- if .Values.components.autorecovery }}
apiVersion: v1
kind: ServiceAccount
metadata:
diff --git a/charts/pulsar/templates/autorecovery-service.yaml
b/charts/pulsar/templates/autorecovery-service.yaml
index 1ab741f..348ccd5 100644
--- a/charts/pulsar/templates/autorecovery-service.yaml
+++ b/charts/pulsar/templates/autorecovery-service.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
+{{- if .Values.components.autorecovery }}
apiVersion: v1
kind: Service
metadata:
diff --git a/charts/pulsar/templates/autorecovery-statefulset.yaml
b/charts/pulsar/templates/autorecovery-statefulset.yaml
index a410d55..bdf0311 100644
--- a/charts/pulsar/templates/autorecovery-statefulset.yaml
+++ b/charts/pulsar/templates/autorecovery-statefulset.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
+{{- if .Values.components.autorecovery }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
diff --git a/charts/pulsar/templates/broker-configmap.yaml
b/charts/pulsar/templates/broker-configmap.yaml
index 6994e22..c9160d6 100644
--- a/charts/pulsar/templates/broker-configmap.yaml
+++ b/charts/pulsar/templates/broker-configmap.yaml
@@ -97,10 +97,10 @@ data:
# Function Worker Settings
# function worker configuration
- {{- if not (or .Values.components.functions .Values.extra.functionsAsPods) }}
+ {{- if not .Values.components.functions }}
functionsWorkerEnabled: "false"
{{- end }}
- {{- if or .Values.components.functions .Values.extra.functionsAsPods }}
+ {{- if .Values.components.functions }}
functionsWorkerEnabled: "true"
{{- if .Values.functions.useBookieAsStateStore }}
PF_stateStorageServiceUrl: "bk://{{ template "pulsar.fullname" . }}-{{
.Values.bookkeeper.component }}:{{ .Values.bookkeeper.ports.statestore }}"
diff --git a/charts/pulsar/templates/broker-rbac.yaml
b/charts/pulsar/templates/broker-rbac.yaml
index f7c5d8f..3d6dc6e 100644
--- a/charts/pulsar/templates/broker-rbac.yaml
+++ b/charts/pulsar/templates/broker-rbac.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
+{{- if .Values.components.functions }}
apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.functions.rbac.limit_to_namespace }}
kind: Role
diff --git a/charts/pulsar/templates/broker-service-account.yaml
b/charts/pulsar/templates/broker-service-account.yaml
index ab9ae60..a63c67b 100644
--- a/charts/pulsar/templates/broker-service-account.yaml
+++ b/charts/pulsar/templates/broker-service-account.yaml
@@ -33,7 +33,7 @@ metadata:
---
{{- end }}
-{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
+{{- if .Values.components.functions }}
apiVersion: v1
kind: ServiceAccount
metadata:
diff --git a/charts/pulsar/templates/dashboard-deployment.yaml
b/charts/pulsar/templates/dashboard-deployment.yaml
deleted file mode 100644
index 343d022..0000000
--- a/charts/pulsar/templates/dashboard-deployment.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.extra.dashboard }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
- namespace: {{ template "pulsar.namespace" . }}
- labels:
- {{- include "pulsar.standardLabels" . | nindent 4 }}
- component: {{ .Values.dashboard.component }}
-spec:
- replicas: {{ .Values.dashboard.replicaCount }}
- selector:
- matchLabels:
- {{- include "pulsar.matchLabels" . | nindent 6 }}
- component: {{ .Values.dashboard.component }}
- template:
- metadata:
- labels:
- {{- include "pulsar.template.labels" . | nindent 8 }}
- component: {{ .Values.dashboard.component }}
-
- annotations:
-{{ toYaml .Values.dashboard.annotations | indent 8 }}
- spec:
- {{- if .Values.dashboard.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.dashboard.nodeSelector | indent 8 }}
- {{- end }}
- {{- if .Values.dashboard.tolerations }}
- tolerations:
-{{ toYaml .Values.dashboard.tolerations | indent 8 }}
- {{- end }}
- terminationGracePeriodSeconds: {{ .Values.dashboard.gracePeriod }}
- containers:
- - name: "{{ template "pulsar.fullname" . }}-{{
.Values.dashboard.component }}"
- image: "{{ .Values.dashboard.image.repository }}:{{
.Values.dashboard.image.tag }}"
- imagePullPolicy: {{ .Values.dashboard.image.pullPolicy }}
- {{- if .Values.dashboard.resources }}
- resources:
-{{ toYaml .Values.dashboard.resources | indent 10 }}
- {{- end }}
- ports:
- - name: http
- containerPort: 80
- env:
- - name: SERVICE_URL
- value: http://{{ template "pulsar.fullname" . }}-{{
.Values.broker.component }}:8080/
-{{- end }}
diff --git a/charts/pulsar/templates/dashboard-ingress.yaml
b/charts/pulsar/templates/dashboard-ingress.yaml
deleted file mode 100644
index 181f704..0000000
--- a/charts/pulsar/templates/dashboard-ingress.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.extra.dashboard }}
-{{- if .Values.dashboard.ingress.enabled }}
-{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }}
-apiVersion: extensions/v1beta1
-{{- else }}
-apiVersion: networking.k8s.io/v1
-{{- end }}
-kind: Ingress
-metadata:
- labels:
- {{- include "pulsar.standardLabels" . | nindent 4 }}
- component: {{ .Values.dashboard.component }}
- annotations:
-{{- with .Values.dashboard.ingress.annotations }}
-{{ toYaml . | indent 4 }}
-{{- end }}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
- namespace: {{ template "pulsar.namespace" . }}
-spec:
- {{- with .Values.dashboard.ingress.ingressClassName }}
- ingressClassName: {{ . }}
- {{- end }}
-{{- if .Values.dashboard.ingress.tls.enabled }}
- tls:
- - hosts:
- - {{ .Values.dashboard.ingress.hostname }}
- {{- with .Values.dashboard.ingress.tls.secretName }}
- secretName: {{ . }}
- {{- end }}
-{{- end }}
- rules:
- - host: {{ required "Dashboard ingress hostname not provided"
.Values.dashboard.ingress.hostname }}
- http:
- paths:
- - path: {{ .Values.dashboard.ingress.path }}
- {{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }}
- backend:
- serviceName: "{{ template "pulsar.fullname" . }}-{{
.Values.dashboard.component }}"
- servicePort: {{ .Values.dashboard.ingress.port }}
- {{- else }}
- pathType: ImplementationSpecific
- backend:
- service:
- name: "{{ template "pulsar.fullname" . }}-{{
.Values.dashboard.component }}"
- port:
- number: {{ .Values.dashboard.ingress.port }}
- {{- end }}
-{{- end }}
-{{- end }}
diff --git a/charts/pulsar/templates/dashboard-service.yaml
b/charts/pulsar/templates/dashboard-service.yaml
deleted file mode 100644
index 46f9bb7..0000000
--- a/charts/pulsar/templates/dashboard-service.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.extra.dashboard }}
-apiVersion: v1
-kind: Service
-metadata:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
- namespace: {{ template "pulsar.namespace" . }}
- labels:
- {{- include "pulsar.standardLabels" . | nindent 4 }}
- component: {{ .Values.dashboard.component }}
- annotations:
-{{ toYaml .Values.dashboard.service.annotations | indent 4 }}
-spec:
- ports:
-{{ toYaml .Values.dashboard.service.ports | indent 2 }}
- clusterIP: None
- selector:
- {{- include "pulsar.matchLabels" . | nindent 4 }}
- component: {{ .Values.dashboard.component }}
-{{- end }}
diff --git a/charts/pulsar/templates/proxy-configmap.yaml
b/charts/pulsar/templates/proxy-configmap.yaml
index f28a3fd..5911f01 100644
--- a/charts/pulsar/templates/proxy-configmap.yaml
+++ b/charts/pulsar/templates/proxy-configmap.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.proxy .Values.extra.proxy }}
+{{- if .Values.components.proxy }}
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/charts/pulsar/templates/proxy-pdb.yaml
b/charts/pulsar/templates/proxy-pdb.yaml
index f39970d..285d0ef 100644
--- a/charts/pulsar/templates/proxy-pdb.yaml
+++ b/charts/pulsar/templates/proxy-pdb.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.proxy .Values.extra.proxy }}
+{{- if .Values.components.proxy }}
{{- if .Values.proxy.pdb.usePolicy }}
# pdb version detection
{{- if semverCompare "<1.21-0" .Capabilities.KubeVersion.Version }}
diff --git a/charts/pulsar/templates/proxy-service.yaml
b/charts/pulsar/templates/proxy-service.yaml
index 6f5235c..63994e9 100644
--- a/charts/pulsar/templates/proxy-service.yaml
+++ b/charts/pulsar/templates/proxy-service.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.proxy .Values.extra.proxy }}
+{{- if .Values.components.proxy }}
apiVersion: v1
kind: Service
metadata:
diff --git a/charts/pulsar/templates/proxy-statefulset.yaml
b/charts/pulsar/templates/proxy-statefulset.yaml
index 32092bd..1ea2bfe 100644
--- a/charts/pulsar/templates/proxy-statefulset.yaml
+++ b/charts/pulsar/templates/proxy-statefulset.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.proxy .Values.extra.proxy }}
+{{- if .Values.components.proxy }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
index d1e33a0..90cf91f 100644
--- a/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
+++ b/charts/pulsar/templates/pulsar-manager-admin-secret.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if and (or .Values.components.pulsar_manager .Values.extra.pulsar_manager)
}}
+{{- if .Values.components.pulsar_manager }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
index 683fd93..14ff169 100644
--- a/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
+++ b/charts/pulsar/templates/pulsar-manager-cluster-initialize.yaml
@@ -18,7 +18,7 @@
#
{{- if or .Release.IsInstall .Values.initialize }}
-{{- if or .Values.components.pulsar_manager .Values.extra.pulsar_manager }}
+{{- if .Values.components.pulsar_manager }}
apiVersion: batch/v1
kind: Job
metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-configmap.yaml
b/charts/pulsar/templates/pulsar-manager-configmap.yaml
index 6154265..5595931 100644
--- a/charts/pulsar/templates/pulsar-manager-configmap.yaml
+++ b/charts/pulsar/templates/pulsar-manager-configmap.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.pulsar_manager .Values.extra.pulsar_manager }}
+{{- if .Values.components.pulsar_manager }}
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-service.yaml
b/charts/pulsar/templates/pulsar-manager-service.yaml
index bf08955..0cbb294 100644
--- a/charts/pulsar/templates/pulsar-manager-service.yaml
+++ b/charts/pulsar/templates/pulsar-manager-service.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.pulsar_manager .Values.extra.pulsar_manager }}
+{{- if .Values.components.pulsar_manager }}
apiVersion: v1
kind: Service
metadata:
diff --git a/charts/pulsar/templates/pulsar-manager-statefulset.yaml
b/charts/pulsar/templates/pulsar-manager-statefulset.yaml
index 01896fa..62ee59e 100644
--- a/charts/pulsar/templates/pulsar-manager-statefulset.yaml
+++ b/charts/pulsar/templates/pulsar-manager-statefulset.yaml
@@ -17,7 +17,7 @@
# under the License.
#
-{{- if or .Values.components.pulsar_manager .Values.extra.pulsar_manager }}
+{{- if .Values.components.pulsar_manager }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index 6df457b..dcba387 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -127,21 +127,6 @@ components:
# pulsar manager
pulsar_manager: false
-## which extra components to deploy (Deprecated)
-extra:
- # Pulsar proxy
- proxy: false
- # Bookkeeper auto-recovery
- autoRecovery: false
- # Pulsar dashboard
- # Deprecated
- # Replace pulsar-dashboard with pulsar-manager
- dashboard: false
- # pulsar manager
- pulsar_manager: false
- # Configure Kubernetes runtime for Functions
- functionsAsPods: false
-
# default image tag for pulsar images
# uses chart's appVersion when unspecified
defaultPulsarImageTag:
@@ -1114,50 +1099,6 @@ proxy:
usePolicy: true
maxUnavailable: 1
-## Pulsar Extra: Dashboard
-## templates/dashboard-deployment.yaml
-## Deprecated
-##
-dashboard:
- component: dashboard
- replicaCount: 1
- # nodeSelector:
- # cloud.google.com/gke-nodepool: default-pool
- annotations: {}
- tolerations: []
- gracePeriod: 0
- image:
- repository: apachepulsar/pulsar-dashboard
- tag: latest
- pullPolicy: IfNotPresent
- resources:
- requests:
- memory: 1Gi
- cpu: 250m
- ## Dashboard service
- ## templates/dashboard-service.yaml
- ##
- service:
- annotations: {}
- ports:
- - name: server
- port: 80
- ingress:
- enabled: false
- annotations: {}
- ingressClassName: ""
- tls:
- enabled: false
-
- ## Optional. Leave it blank if your Ingress Controller can provide a
default certificate.
- secretName: ""
-
- ## Required if ingress is enabled
- hostname: ""
- path: "/"
- port: 80
-
-
## Pulsar ToolSet
## templates/toolset-deployment.yaml
##
