merge upstream changes #13
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
…riod pkg/k8sutil: add test case for secret name sanitization
…figs pkg/prometheus: Allow configuration of relabel_configs per ServiceMonitor
Add dashboards to readme
This is distributed as a library that the user is meant to import.
example:
```
kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import 'kube-prometheus/kube-prometheus-thanos.libsonnet') +
{
_config+:: {...}
};
```
…heus-thanos Add initial thanos support to kube-prometheus
contrib/kube-prometheus: Run jb update and generate all manifests.
*: Add illegal update reconciliation
…nager contrib/kube-prometheus: Generate new manifests with antiAffinity contrib/kube-prometheus: jb update Documentation: Generate after updating kube-prometheus manifests contrib/kube-prometheus: Move antiaffinity into own jsonnet file foobar
As these docs are outdated, this patch removes the link in the README.md.
OWNERS: Add metalmatze and s-urbaniak
remove duplicate alertmanager down alert
contrib/kube-prometheus: Set antiAffinity for Prometheus & Alertmanager
the operator spec key is named "externalUrl", rather than "externalURL"
fix breaking typo
Remove GOARCH=amd64 to prevent cross-compiling go binaries
Increase CPU limits for small containers to not being throttled as often
Currently, listwatch is racy, as revealed by the following error, when
running in k8s:
```
W1128 16:49:11.288643 1 reflector.go:270] github.com/coreos/prometheus-operator/pkg/prometheus/operator.go:403: watch of *v1.ConfigMap ended with: too old resource version: 14464 (19288)
panic: send on closed channel
goroutine 1373 [running]:
github.com/coreos/prometheus-operator/pkg/listwatch.newMultiWatch.func1(0x17f1c00, 0xc00084cab0, 0xc0002bbce0)
/home/sur/go/src/github.com/coreos/prometheus-operator/pkg/listwatch/listwatch.go:181 +0x4f
created by github.com/coreos/prometheus-operator/pkg/listwatch.newMultiWatch
/home/sur/go/src/github.com/coreos/prometheus-operator/pkg/listwatch/listwatch.go:175 +0x298
```
This fixes it by ensuring that the event sender channel is closed,
once all sender dispatcher goroutines exited.
This also fixes a small concurrency issue in the tests and adds the
`-race` parameter to unit tests in the Makefile.
…iwatch pkg/listwatch: fix racy multiwatch
kube-prometheus: bump prometheus-operator
…ig-docs Additional scrape config docs
openshift-ci-robot
added
the
size/XXL
|
CI shows: This is caused by the now generated kubernetes client which uses >= Go1.10 features. Apparently we are still using Go 1.9 for the build here. Trying to find out where we can bump this 🤔 @pgier Do you maybe have any ideas? |
Merged
s-urbaniak
force-pushed
the
openshift-master
branch
from
6f7a197
to
81b4644
Compare
|
PTAL @brancz this looks like the build is green now :-) Note, this is a simple |
|
/lgtm |
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.
cc @brancz