Skip to content

Commit bc2cb1d

Browse files
authored
Revert detector config (#1225)
<!-- ### Contribution Checklist - Name the pull request in the form "[charts/<chart-name>] Title of the pull request". Skip *[charts/<chart-name>]* if the PR doesn't change a specific chart. E.g. `[docs] Fix typo in README`. - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review. - Each pull request should address only one issue, not mix up code from multiple issues. - Each commit in the pull request has a meaningful commit message - Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below. **(The sections below can be removed for hotfixes of typos)** --> *(If this PR fixes a github issue, please add `Fixes #<xyz>`.)* Fixes #<xyz> *(or if this PR is one task of a github issue, please add `Master Issue: #<xyz>` to link to the master issue.)* Master Issue: #<xyz> ### Motivation *Explain here the context, and why you're making that change. What is the problem you're trying to solve.* ### Modifications *Describe the modifications you've done.* ### Verifying this change - [ ] Make sure that the change passes the CI checks. *(Please pick either of the following options)* This change is a trivial rework / code cleanup without any test coverage. *(or)* This change is already covered by existing tests, such as *(please describe tests)*. *(or)* This change added tests and can be verified as follows: *(example:)* - *Added integration tests for end-to-end deployment with large payloads (10MB)* - *Extended integration test for recovery after broker failure* ### Documentation Check the box below. Need to update docs? - [ ] `doc-required` (If you need help on updating docs, create a doc issue) - [ ] `no-need-doc` (Please explain why) - [ ] `doc` (If this PR contains doc changes)
1 parent 4c35d14 commit bc2cb1d

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,18 @@ spec:
132132
env:
133133
{{- if and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled }}
134134
- name: brokerClientAuthenticationParameters
135-
value: "file:///mnt/token/TOKEN"
135+
valueFrom:
136+
secretKeyRef:
137+
name: {{ .Release.Name }}-token-admin
138+
key: TOKEN
136139
{{- end }}
137140
{{- if .Values.pulsar_detector.extraEnv }}
138141
{{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }}
139142
{{- end }}
140-
{{- if or .Values.pulsar_detector.extraVolumeMounts (and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled) }}
141-
volumeMounts:
142-
{{- if and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled }}
143-
- mountPath: /mnt/token
144-
secretName: {{ .Release.Name }}-token-admin
145-
{{- end }}
146143
{{- if .Values.pulsar_detector.extraVolumeMounts }}
144+
volumeMounts:
147145
{{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }}
148146
{{- end }}
149-
{{- end }}
150147
volumes:
151148
- name: tmp
152149
emptyDir: {}

charts/sn-platform/templates/detector/pulsar-detector-deployment.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,21 +139,18 @@ spec:
139139
{{- end }}
140140
{{- if and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled }}
141141
- name: brokerClientAuthenticationParameters
142-
value: "file:///mnt/token/TOKEN"
142+
valueFrom:
143+
secretKeyRef:
144+
name: {{ .Release.Name }}-token-admin
145+
key: TOKEN
143146
{{- end }}
144147
{{- if .Values.pulsar_detector.extraEnv }}
145148
{{- toYaml .Values.pulsar_detector.extraEnv | nindent 10 }}
146149
{{- end }}
147-
{{- if or .Values.pulsar_detector.extraVolumeMounts (and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled) }}
148-
volumeMounts:
149-
{{- if and .Values.auth.authentication.enabled .Values.auth.authentication.jwt.enabled }}
150-
- mountPath: /mnt/token
151-
secretName: {{ .Release.Name }}-token-admin
152-
{{- end }}
153150
{{- if .Values.pulsar_detector.extraVolumeMounts }}
151+
volumeMounts:
154152
{{- toYaml .Values.pulsar_detector.extraVolumeMounts | nindent 10 }}
155153
{{- end }}
156-
{{- end }}
157154
volumes:
158155
- name: tmp
159156
emptyDir: {}

0 commit comments

Comments
 (0)