Skip to content

Commit cda68a3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #30 from paulfantom/merge-release-0.30.1
Merge release 0.30.1
2 parents 73ed419 + 169fb1a commit cda68a3

6,269 files changed

Lines changed: 234717 additions & 1823484 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug.md‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
name: Bug
3+
about: Report a bug related to the Prometheus Operator
4+
labels: kind/bug
5+
---
6+
7+
<!--
8+
9+
Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
10+
11+
-->
12+
13+
**What happened?**
14+
15+
**Did you expect to see some different?**
16+
17+
**How to reproduce it (as minimally and precisely as possible)**:
18+
19+
**Environment**
20+
21+
* Prometheus Operator version:
22+
23+
`Insert image tag or Git SHA here`
24+
<!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
25+
26+
* Kubernetes version information:
27+
28+
`kubectl version`
29+
<!-- Replace the command with its output above -->
30+
31+
* Kubernetes cluster kind:
32+
33+
insert how you created your cluster: kops, bootkube, tectonic-installer, etc.
34+
35+
* Manifests:
36+
37+
```
38+
insert manifests relevant to the issue
39+
```
40+
41+
* Prometheus Operator Logs:
42+
43+
```
44+
insert Prometheus Operator logs relevant to the issue here
45+
```
46+
47+
**Anything else we need to know?**:

‎.github/ISSUE_TEMPLATE/feature.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature
3+
about: If you want to propose a new feature or enhancement
4+
labels: kind/feature
5+
---
6+
7+
<!--
8+
9+
Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
10+
11+
-->
12+
13+
**What is missing?**
14+
15+
**Why do we need it?**
16+
17+
**Environment**
18+
19+
* Prometheus Operator version:
20+
21+
`Insert image tag or Git SHA here`
22+
<!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
23+
24+
**Anything else we need to know?**:

‎.github/ISSUE_TEMPLATE/support.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
name: Support
3+
about: If you have questions about the Prometheus Operator
4+
labels: kind/support
5+
---
6+
7+
<!--
8+
9+
Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
10+
11+
-->
12+
13+
**What did you do?**
14+
15+
**Did you expect to see some different?**
16+
17+
**Environment**
18+
19+
* Prometheus Operator version:
20+
21+
`Insert image tag or Git SHA here`
22+
<!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
23+
24+
* Kubernetes version information:
25+
26+
`kubectl version`
27+
<!-- Replace the command with its output above -->
28+
29+
* Kubernetes cluster kind:
30+
31+
insert how you created your cluster: kops, bootkube, tectonic-installer, etc.
32+
33+
* Manifests:
34+
35+
```
36+
insert manifests relevant to the issue
37+
```
38+
39+
* Prometheus Operator Logs:
40+
41+
```
42+
insert Prometheus Operator logs relevant to the issue here
43+
```
44+
45+
**Anything else we need to know?**:

‎.travis.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
sudo: required
2+
dist: xenial
23
language: go
34
go:
4-
- "1.11"
5+
- "1.12.x"
6+
go_import_path: github.com/coreos/prometheus-operator
7+
env:
8+
- GO111MODULE=on
9+
cache:
10+
directories:
11+
- $GOCACHE
12+
- $GOPATH/pkg/mod
513
services:
614
- docker
715
before_install:
@@ -12,24 +20,15 @@ jobs:
1220
- stage: Sanity check and tests
1321
# Check generated contents are up to date and code is formatted.
1422
script: make --always-make format generate-in-docker && git diff --exit-code
15-
- script: cd contrib/kube-prometheus && make test-in-docker
1623
# Build Prometheus Operator rule config map to rule file crds cli tool
1724
- script: cd cmd/po-rule-migration && go install
1825
# Ensure vendor folder matches vendor.json
19-
- script: ./scripts/golang-dep-ensure.sh
26+
- script: ./scripts/golang-mod.sh
2027
# Unit tests
2128
- script: make test-unit
2229
# E2e tests
2330
- script: ./scripts/travis-e2e.sh
24-
- script: ./scripts/travis-e2e-helm.sh
25-
26-
- stage: deploy
27-
script: skip
28-
deploy:
29-
provider: script
30-
script: make helm-sync-s3
31-
on:
32-
branch: master
31+
# kube-prometheus e2e tests
3332

3433
- stage: push-docker-image
3534
script: ./scripts/travis-push-docker-image.sh

‎CHANGELOG.md‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
## Next release
2+
3+
## 0.30.1 / 2019-05-31
4+
5+
* [BUGFIX] Update Thanos to 0.4.0 to fix configmap-reloader (#2611)
6+
* [BUGFIX] Alertmanager: Use /-/healthy and /-/ready for probes (#2600)
7+
8+
## 0.30.0 / 2019-05-10
9+
10+
Note: Both kube-prometheus (#2554) and the Helm Chart (#2416) have been removed from this repository.
11+
kube-prometheus is not hosted as github.com/coroes/kube-prometheus and the helm chart is available at https://github.com/helm/charts/tree/master/stable/prometheus-operator
12+
13+
* [CHANGE] Drop support for Alertmanager < v0.15.0 (#2568)
14+
* [FEATURE] Add Prometheus Config Reloader CPU and Memory flags (#2466)
15+
* [FEATURE] Support `--max-samples` flag in QuerySpec (#2505)
16+
* [FEATURE] Adding kustomization files for remote bases (#2497)
17+
* [FEATURE] Allow disabling limits on sidecars (#2560)
18+
* [FEATURE] Modify arbitrary parts of the operator generated containers (#2445)
19+
* [ENHANCEMENT] Add proper Operator labels as recommended by SIG-Apps (#2427)
20+
* [ENHANCEMENT] Watch ConfigMaps having the prometheus-name selector (#2454)
21+
* [ENHANCEMENT] Add prometheusExternalLabelName field to Prometheus object (#2430)
22+
* [ENHANCEMENT] Optional secret in scrapeconfig (#2511)
23+
* [ENHANCEMENT] Update PodSecurityContext docs (#2569)
24+
* [ENHANCEMENT] Update Kubernetes client libraries to 1.14.0 (#2570)
25+
* [ENHANCEMENT] Use Go modules with Kubernetes 1.14 (#2571)
26+
* [ENHANCEMENT] Update to Alertmanager v0.17.0 (#2587)
27+
* [ENHANCEMENT] Add support for setting Log Format for Alertmanager (#2577)
28+
* [ENHANCEMENT] Switch Deployments and StatefulSets from apps/v1beta to apps/v1 (#2593)
29+
* [ENHANCEMENT] Add Service and Servicemonitor to bundle.yaml (#2595)
30+
* [BUGFIX] Fix startup nodeSyncEndpoints (#2475)
31+
* [BUGIFX] Update Thanos vendoring to include config reloader fixes (#2504)
32+
33+
## 0.29.0 / 2019-02-19
34+
35+
* [FEATURE] Thanos sidecar supports external Thanos clusters (#2412)
36+
* [FEATURE] Make replicas external label name configurable (#2411)
37+
* [FEATURE] Flags for config reloader memory and cpu limits (#2403)
38+
* [ENHANCEMENT] Update to Prometheus v2.7.1 as default (#2374)
39+
* [ENHANCEMENT] Update to Alertmanager v0.16.1 as default (#2362)
40+
41+
## 0.28.0 / 2019-01-24
42+
43+
* [FEATURE] CLI tool to lint YAML against CRD definitions (#2269)
44+
* [FEATURE] Support Thanos v0.2 arbitrary object storage configuration (#2264)
45+
* [ENHANCEMENT] Update Alertmanager to v0.16.0 (#2145)
46+
* [ENHANCEMENT] Added AlertResendDelay to Prometheus resource (#2265)
47+
* [ENHANCEMENT] Support min_shards configuration of the queueConfig (#2284)
48+
* [ENHANCEMENT] Write compressed Prometheus config into Kubernetes Secret (#2243)
49+
* [ENHANCEMENT] Add flag to enable Prometheus web admin API (#2300)
50+
* [ENHANCEMENT] Add logFormat support for Prometheus (#2307)
51+
* [ENHANCEMENT] Configure Thanos sidecar with route prefix (#2345)
52+
* [BUGFIX] Fix omitting source_labels where they are unnecessary (#2292)
53+
* [BUGFIX] Guard against nil targetPort (#2318)
54+
155
## 0.27.0 / 2019-01-08
256

357
* [FEATURE] Add `image` field to specify full Prometheus, Alertmanager and Thanos images.
@@ -184,7 +238,7 @@ This release adds validations as a beta feature. It will only be installed on ne
184238
* [FEATURE] Add ability to specify log level.
185239
* [FEATURE] Add support for dropping metrics at scrape time.
186240
* [ENHANCEMENT] Ensure that resource limit can't make Pods unschedulable.
187-
* [ENHANCEMENT] Allow configuring emtpyDir volumes
241+
* [ENHANCEMENT] Allow configuring emptyDir volumes
188242
* [BUGFIX] Use `--storage.tsdb.no-lockfile` for Prometheus 2.0.
189243
* [BUGFIX] Fix Alertmanager default storage.path.
190244

@@ -337,7 +391,7 @@ be created properly.
337391
* [FEATURE] Allow not tagging targets with the `namespace` label.
338392
* [FEATURE] Allow specifying `ServiceAccountName` to be used by Prometheus pods.
339393
* [ENHANCEMENT] Label governing services to uniquely identify them.
340-
* [ENHANCEMENT] Reconcile Serive and Endpoints objects.
394+
* [ENHANCEMENT] Reconcile Service and Endpoints objects.
341395
* [ENHANCEMENT] General stability improvements.
342396
* [BUGFIX] Hostname cannot be fqdn when syncing kubelets into Endpoints object.
343397

‎Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
1+
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
22
WORKDIR /go/src/github.com/coreos/prometheus-operator
33
COPY . .
4+
ENV GO111MODULE=on
45
RUN make operator-no-deps
56

67
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

‎Dockerfile.config-reloader‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
1+
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
22
WORKDIR /go/src/github.com/coreos/prometheus-operator
33
COPY . .
4+
ENV GO111MODULE=on
45
RUN make prometheus-config-reloader
56

67
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

‎Dockerfile.config-reloader.rhel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
1+
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
22
WORKDIR /go/src/github.com/coreos/prometheus-operator
33
COPY . .
4+
ENV GO111MODULE=on
45
RUN make prometheus-config-reloader
56

67
FROM registry.svc.ci.openshift.org/ocp/4.0:base

‎Documentation/additional-scrape-config.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ scrape configs are going to break Prometheus after the upgrade.
1818

1919
First, you will need to create the additional configuration.
2020
Below we are making a simple "prometheus" config. Name this
21-
`prometheus-additional.yaml` or something similiar.
21+
`prometheus-additional.yaml` or something similar.
2222

2323
```
2424
- job_name: "prometheus"

0 commit comments

Comments
 (0)