Skip to content

Commit 8426c8d

Browse files
authored
Fix deprecated values (#49)
Fixes #46 ### Motivation There were some templates that relied on extra values that are deprecated. ### Modifications Modified the checks to check for non deprecated values or deprecated values. ### Verifying this change - [X] Make sure that the change passes the CI checks.
1 parent a41b6c5 commit 8426c8d

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

charts/pulsar/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apiVersion: v1
2121
appVersion: "2.6.0"
2222
description: Apache Pulsar Helm chart for Kubernetes
2323
name: pulsar
24-
version: 2.6.0-1
24+
version: 2.6.0-2
2525
home: https://pulsar.apache.org
2626
sources:
2727
- https://github.com/apache/pulsar

charts/pulsar/templates/broker-rbac.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
# under the License.
1818
#
1919

20-
{{- if .Values.extra.functionsAsPods }}
20+
{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
2121
apiVersion: rbac.authorization.k8s.io/v1beta1
2222
kind: ClusterRole
2323
metadata:
24-
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
24+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
2525
rules:
2626
- apiGroups: [""]
2727
resources:
@@ -41,20 +41,20 @@ rules:
4141
apiVersion: v1
4242
kind: ServiceAccount
4343
metadata:
44-
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
44+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
4545
namespace: {{ .Values.namespace }}
4646
---
4747

4848
apiVersion: rbac.authorization.k8s.io/v1beta1
4949
kind: ClusterRoleBinding
5050
metadata:
51-
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
51+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
5252
roleRef:
5353
apiGroup: rbac.authorization.k8s.io
5454
kind: ClusterRole
55-
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
55+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
5656
subjects:
5757
- kind: ServiceAccount
58-
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
58+
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
5959
namespace: {{ .Values.namespace }}
60-
{{- end }}
60+
{{- end }}

charts/pulsar/templates/grafana-ingress.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# under the License.
1818
#
1919

20-
{{- if .Values.extra.monitoring}}
21-
{{- if .Values.grafana.ingress.enabled }}
20+
{{- if or .Values.monitoring.grafana .Values.extra.monitoring }}
21+
{{- if .Values.grafana.ingress.enabled }}
2222
apiVersion: extensions/v1beta1
2323
kind: Ingress
2424
metadata:
@@ -46,5 +46,5 @@ spec:
4646
backend:
4747
serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
4848
servicePort: {{ .Values.grafana.ingress.port }}
49-
{{- end }}
50-
{{- end }}
49+
{{- end }}
50+
{{- end }}

0 commit comments

Comments
 (0)