Support TidbMonitor Ingress #2314
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
cofyc
reviewed
Apr 28, 2020
pkg/controller/generic_control.go
Outdated
| existingIngress.Annotations = map[string]string{} | ||
| } | ||
| for k, v := range desiredIngress.Annotations { | ||
| desiredIngress.Annotations[k] = v |
cofyc
reviewed
Apr 28, 2020
Co-Authored-By: Yecheng Fu <cofyc.jackson@gmail.com>
cofyc
reviewed
Apr 28, 2020
cofyc
reviewed
Apr 28, 2020
| func (mm *MonitorManager) syncPrometheusIngress(monitor *v1alpha1.TidbMonitor) error { | ||
| if monitor.Spec.Prometheus.Ingress == nil { | ||
| return mm.removeIngressIfExist(monitor, prometheusName(monitor)) | ||
| } |
There was a problem hiding this comment.
should we check monitor.Spec.Prometheus too like grafana?
There was a problem hiding this comment.
We don't have to check as Prometheus is a non-nil in TidbMonitorSpec
Co-Authored-By: Yecheng Fu <cofyc.jackson@gmail.com>
cofyc
reviewed
Apr 28, 2020
Co-Authored-By: Yecheng Fu <cofyc.jackson@gmail.com>
cofyc
approved these changes
Apr 28, 2020
|
/merge |
|
/run-all-tests |
|
cherry pick to release-1.1 in PR #2320 |
sre-bot
added a commit
that referenced
this pull request
Apr 28, 2020
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.
What problem does this PR solve?
Support TidbMonitor Ingress
Close #2276
Related changes
Does this PR introduce a user-facing change?: