openshift · openshift-merge-robot · Jun 4, 2019 · Jan 31, 2019 · Feb 1, 2019 · Jan 31, 2019
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,47 @@
+---
+name: Bug
+about: Report a bug related to the Prometheus Operator
+labels: kind/bug
+---
+
+<!--
+
+Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
+
+-->
+
+**What happened?**
+
+**Did you expect to see some different?**
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Environment**
+
+* Prometheus Operator version:
+
+    `Insert image tag or Git SHA here`
+    <!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
+
+* Kubernetes version information:
+
+    `kubectl version`
+    <!-- Replace the command with its output above -->
+
+* Kubernetes cluster kind:
+
+    insert how you created your cluster: kops, bootkube, tectonic-installer, etc.
+
+* Manifests:
+
+```
+insert manifests relevant to the issue
+```
+
+* Prometheus Operator Logs:
+
+```
+insert Prometheus Operator logs relevant to the issue here
+```
+
+**Anything else we need to know?**:
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,24 @@
+---
+name: Feature
+about: If you want to propose a new feature or enhancement
+labels: kind/feature
+---
+
+<!--
+
+Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
+
+-->
+
+**What is missing?**
+
+**Why do we need it?**
+
+**Environment**
+
+* Prometheus Operator version:
+
+    `Insert image tag or Git SHA here`
+    <!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
+
+**Anything else we need to know?**:
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
@@ -0,0 +1,45 @@
+---
+name: Support
+about: If you have questions about the Prometheus Operator
+labels: kind/support
+---
+
+<!--
+
+Feel free to ask questions in #prometheus-operator on Kubernetes Slack!
+
+-->
+
+**What did you do?**
+
+**Did you expect to see some different?**
+
+**Environment**
+
+* Prometheus Operator version:
+
+    `Insert image tag or Git SHA here`
+    <!-- Try kubectl -n monitoring describe deployment prometheus-operator -->
+
+* Kubernetes version information:
+
+    `kubectl version`
+    <!-- Replace the command with its output above -->
+
+* Kubernetes cluster kind:
+
+    insert how you created your cluster: kops, bootkube, tectonic-installer, etc.
+
+* Manifests:
+
+```
+insert manifests relevant to the issue
+```
+
+* Prometheus Operator Logs:
+
+```
+insert Prometheus Operator logs relevant to the issue here
+```
+
+**Anything else we need to know?**:
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,15 @@
 sudo: required
+dist: xenial
 language: go
 go:
-- "1.11"
+- "1.12.x"
+go_import_path: github.com/coreos/prometheus-operator
+env:
+  - GO111MODULE=on
+cache:
+  directories:
+  - $GOCACHE
+  - $GOPATH/pkg/mod
 services:
 - docker
 before_install:
@@ -12,24 +20,15 @@ jobs:
   - stage: Sanity check and tests
   # Check generated contents are up to date and code is formatted.
     script: make --always-make format generate-in-docker && git diff --exit-code
-  - script: cd contrib/kube-prometheus && make test-in-docker
   # Build Prometheus Operator rule config map to rule file crds cli tool
   - script: cd cmd/po-rule-migration && go install
   # Ensure vendor folder matches vendor.json
-  - script: ./scripts/golang-dep-ensure.sh
+  - script: ./scripts/golang-mod.sh
   # Unit tests
   - script: make test-unit
   # E2e tests
   - script: ./scripts/travis-e2e.sh
-  - script: ./scripts/travis-e2e-helm.sh
-
-  - stage: deploy
-    script: skip
-    deploy:
-      provider: script
-      script: make helm-sync-s3
-      on:
-        branch: master
+  # kube-prometheus e2e tests
 
   - stage: push-docker-image
     script: ./scripts/travis-push-docker-image.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,57 @@
+## Next release
+
+## 0.30.1 / 2019-05-31
+
+* [BUGFIX] Update Thanos to 0.4.0 to fix configmap-reloader (#2611)
+* [BUGFIX] Alertmanager: Use /-/healthy and /-/ready for probes (#2600)
+
+## 0.30.0 / 2019-05-10
+
+Note: Both kube-prometheus (#2554) and the Helm Chart (#2416) have been removed from this repository.
+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
+
+* [CHANGE] Drop support for Alertmanager < v0.15.0 (#2568)
+* [FEATURE] Add Prometheus Config Reloader CPU and Memory flags (#2466)
+* [FEATURE] Support `--max-samples` flag in QuerySpec (#2505)
+* [FEATURE] Adding kustomization files for remote bases (#2497)
+* [FEATURE] Allow disabling limits on sidecars (#2560)
+* [FEATURE] Modify arbitrary parts of the operator generated containers (#2445)
+* [ENHANCEMENT] Add proper Operator labels as recommended by SIG-Apps (#2427)
+* [ENHANCEMENT] Watch ConfigMaps having the prometheus-name selector (#2454)
+* [ENHANCEMENT] Add prometheusExternalLabelName field to Prometheus object (#2430)
+* [ENHANCEMENT] Optional secret in scrapeconfig (#2511)
+* [ENHANCEMENT] Update PodSecurityContext docs (#2569)
+* [ENHANCEMENT] Update Kubernetes client libraries to 1.14.0 (#2570)
+* [ENHANCEMENT] Use Go modules with Kubernetes 1.14 (#2571)
+* [ENHANCEMENT] Update to Alertmanager v0.17.0 (#2587)
+* [ENHANCEMENT] Add support for setting Log Format for Alertmanager (#2577)
+* [ENHANCEMENT] Switch Deployments and StatefulSets from apps/v1beta to apps/v1 (#2593)
+* [ENHANCEMENT] Add Service and Servicemonitor to bundle.yaml (#2595)
+* [BUGFIX] Fix startup nodeSyncEndpoints (#2475)
+* [BUGIFX] Update Thanos vendoring to include config reloader fixes (#2504)
+
+## 0.29.0 / 2019-02-19
+
+* [FEATURE] Thanos sidecar supports external Thanos clusters (#2412)
+* [FEATURE] Make replicas external label name configurable (#2411)
+* [FEATURE] Flags for config reloader memory and cpu limits (#2403)
+* [ENHANCEMENT] Update to Prometheus v2.7.1 as default (#2374)
+* [ENHANCEMENT] Update to Alertmanager v0.16.1 as default (#2362)
+
+## 0.28.0 / 2019-01-24
+
+* [FEATURE] CLI tool to lint YAML against CRD definitions (#2269)
+* [FEATURE] Support Thanos v0.2 arbitrary object storage configuration (#2264)
+* [ENHANCEMENT] Update Alertmanager to v0.16.0 (#2145)
+* [ENHANCEMENT] Added AlertResendDelay to Prometheus resource (#2265)
+* [ENHANCEMENT] Support min_shards configuration of the queueConfig (#2284)
+* [ENHANCEMENT] Write compressed Prometheus config into Kubernetes Secret (#2243)
+* [ENHANCEMENT] Add flag to enable Prometheus web admin API (#2300)
+* [ENHANCEMENT] Add logFormat support for Prometheus (#2307)
+* [ENHANCEMENT] Configure Thanos sidecar with route prefix (#2345)
+* [BUGFIX] Fix omitting source_labels where they are unnecessary (#2292)
+* [BUGFIX] Guard against nil targetPort (#2318)
+
 ## 0.27.0 / 2019-01-08
 
 * [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
 * [FEATURE] Add ability to specify log level.
 * [FEATURE] Add support for dropping metrics at scrape time.
 * [ENHANCEMENT] Ensure that resource limit can't make Pods unschedulable.
-* [ENHANCEMENT] Allow configuring emtpyDir volumes
+* [ENHANCEMENT] Allow configuring emptyDir volumes
 * [BUGFIX] Use `--storage.tsdb.no-lockfile` for Prometheus 2.0.
 * [BUGFIX] Fix Alertmanager default storage.path.
 
@@ -337,7 +391,7 @@ be created properly.
 * [FEATURE] Allow not tagging targets with the `namespace` label.
 * [FEATURE] Allow specifying `ServiceAccountName` to be used by Prometheus pods.
 * [ENHANCEMENT] Label governing services to uniquely identify them.
-* [ENHANCEMENT] Reconcile Serive and Endpoints objects.
+* [ENHANCEMENT] Reconcile Service and Endpoints objects.
 * [ENHANCEMENT] General stability improvements.
 * [BUGFIX] Hostname cannot be fqdn when syncing kubelets into Endpoints object.
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/coreos/prometheus-operator
 COPY . .
+ENV GO111MODULE=on
 RUN make operator-no-deps
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

diff --git a/Dockerfile.config-reloader b/Dockerfile.config-reloader
@@ -1,6 +1,7 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/coreos/prometheus-operator
 COPY . .
+ENV GO111MODULE=on
 RUN make prometheus-config-reloader
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base

diff --git a/Dockerfile.config-reloader.rhel b/Dockerfile.config-reloader.rhel
@@ -1,6 +1,7 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/coreos/prometheus-operator
 COPY . .
+ENV GO111MODULE=on
 RUN make prometheus-config-reloader
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base

diff --git a/Documentation/additional-scrape-config.md b/Documentation/additional-scrape-config.md
@@ -18,7 +18,7 @@ scrape configs are going to break Prometheus after the upgrade.
 
 First, you will need to create the additional configuration.
 Below we are making a simple "prometheus" config.  Name this
-`prometheus-additional.yaml` or something similiar.
+`prometheus-additional.yaml` or something similar.
 
 ```
 - job_name: "prometheus"