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
This commit is contained in:
Lari Hotari
GitHub
parent
cb269bbaf3
commit
0e3251bea8
@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
|
||||
{{- if .Values.components.autorecovery }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
|
||||
{{- if .Values.components.autorecovery }}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
{{- if or .Values.components.autorecovery .Values.extra.autoRecovery }}
|
||||
{{- if .Values.components.autorecovery }}
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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 }}"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -33,7 +33,7 @@ metadata:
|
||||
---
|
||||
{{- end }}
|
||||
|
||||
{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
|
||||
{{- if .Values.components.functions }}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
|
||||
@ -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 }}
|
||||
@ -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 }}
|
||||
@ -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 }}
|
||||
@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
{{- if or .Values.components.proxy .Values.extra.proxy }}
|
||||
{{- if .Values.components.proxy }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
|
||||
@ -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 }}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
{{- if or .Values.components.proxy .Values.extra.proxy }}
|
||||
{{- if .Values.components.proxy }}
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
##
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user