Skip to content

Commit

Permalink
Fix deprecated values (#49)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
toneill818 authored Aug 13, 2020
1 parent a41b6c5 commit 8426c8d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion charts/pulsar/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apiVersion: v1
appVersion: "2.6.0"
description: Apache Pulsar Helm chart for Kubernetes
name: pulsar
version: 2.6.0-1
version: 2.6.0-2
home: https://pulsar.apache.org
sources:
- https://github.com/apache/pulsar
Expand Down
14 changes: 7 additions & 7 deletions charts/pulsar/templates/broker-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
# under the License.
#

{{- if .Values.extra.functionsAsPods }}
{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
rules:
- apiGroups: [""]
resources:
Expand All @@ -41,20 +41,20 @@ rules:
apiVersion: v1
kind: ServiceAccount
metadata:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
namespace: {{ .Values.namespace }}
---

apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
subjects:
- kind: ServiceAccount
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
namespace: {{ .Values.namespace }}
{{- end }}
{{- end }}
8 changes: 4 additions & 4 deletions charts/pulsar/templates/grafana-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# under the License.
#

{{- if .Values.extra.monitoring}}
{{- if .Values.grafana.ingress.enabled }}
{{- if or .Values.monitoring.grafana .Values.extra.monitoring }}
{{- if .Values.grafana.ingress.enabled }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
Expand Down Expand Up @@ -46,5 +46,5 @@ spec:
backend:
serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
servicePort: {{ .Values.grafana.ingress.port }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

0 comments on commit 8426c8d

Please sign in to comment.