fix issue with service monitor #335
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
yorugac
requested changes
Nov 17, 2023
| @@ -17,5 +17,5 @@ spec: | |||
| port: 8443 | |||
| targetPort: https | |||
| selector: | |||
| control-plane: "controller-manager" | |||
| {{- include "k6-operator.selectorLabels" . | nindent 4 }} | |||
There was a problem hiding this comment.
I suggest to fix the Chart so that control-plane: "controller-manager" would work. Rationale: it'd be preferable to keep the labeling consistent with kustomize base, i.e. here:
https://github.com/grafana/k6-operator/blob/main/config/manager/manager.yaml
There was a problem hiding this comment.
Sure, whatever changes you guys want. I have moved the label inside the deployment template instead.
edwintye
force-pushed
the
fix-issue-324-sm-namespace
branch
from
6e8ee6e to
5c74b21
Compare
|
@yorugac - What is the target date to release this change in the chart? |
|
@datsabk, this change is over here now: https://github.com/grafana/helm-charts/releases/tag/helm-k6-operator-3.2.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #324 where helm install with flag
--set prometheus.enabled=truefails unless thesystemnamespace exists. Set this to the same namespace as all the other resources installed via the chart. Additionally, restrict the namespace selector to be within the same namespace as well so there is chance of accidental cross namespace lookup and drag in another service by chance.Furthermore, fixes the selector label on the service itself as the current select
points to nothing. This can be easily verified without the need of a
ServiceMonitorby port forwarding to the service and perform a simply curl against the endpoint. The change is to use theselectorLabelsthat is used under.spec.template.metadata.labelsin theDeployment.