Merge pull request #122 from fpetkovski/update-version-0.48

Bug 1879495: Bump to 0.48

.github/workflows/ci.yaml

@@ -1,7 +1,13 @@
 name: ci
 on:
-  - push
-  - pull_request
+  pull_request:
+  push:
+    branches:
+      - 'release-*'
+      - 'master'
+      - 'main'
+    tags:
+      - 'v*'
 env:
   golang-version: '1.16'
   kind-version: 'v0.10.0'
@@ -135,7 +141,7 @@ jobs:
       run: >
         EXCLUDE_ALERTMANAGER_TESTS=${{ matrix.alertmanager }}
         EXCLUDE_PROMETHEUS_TESTS=${{ matrix.prometheus }}
-        EXCLUDE_THANOS_TESTS=${{ matrix.thanosruler }}
+        EXCLUDE_THANOSRULER_TESTS=${{ matrix.thanosruler }}
         make test-e2e
   publish:
     runs-on: ubuntu-latest

ADOPTERS.md

@@ -4,8 +4,29 @@ date: 2021-03-08T23:50:39+01:00
 draft: false
 ---
 
+<!--
+
+Insert your entry using this template keeping the list alphabetically sorted:
+
+## <Company/Organization Name>
+
+https://our-link.com/
+
+Environments: AWS, Azure, Google Cloud, Bare Metal, etc
+
+Uses [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus): Yes | No
+
+Details (optional):
+- HA Pair of Prometheus
+- 1000 samples/s (query: `rate(prometheus_tsdb_head_samples_appended_total[5m])`)
+- 10k active series (query: `prometheus_tsdb_head_series`)
+
+-->
+
 This document tracks people and use cases for the Prometheus Operator in production. By creating a list of production use cases we hope to build a community of advisors that we can reach out to with experience using various the Prometheus Operator applications, operation environments, and cluster sizes. The Prometheus Operator development team may reach out periodically to check-in on how the Prometheus Operator is working in the field and update this list.
 
+Go ahead and [add your organization](https://github.com/prometheus-operator/prometheus-operator/edit/master/ADOPTERS.md) to the list.
+
 ## Giant Swarm
 
 [giantswarm.io](https://www.giantswarm.io/)
@@ -59,6 +80,18 @@ Details:
 - 17k samples/s
 - 841k active series
 
+## Nozzle
+
+[nozzle.io](https://nozzle.io)
+
+Environment: Google Cloud
+
+Uses [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus): Yes
+
+Details:
+- 100k samples/s
+- 1M active series
+- 
 ## OpenShift
 
 [openshift.com](https://www.openshift.com/)
@@ -131,18 +164,3 @@ Uses [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus):
 Details (optional):
 - A huge fleet of OpenShift and Kubernetes clusters, each using Prometheus Operator
 - All managed by [Project Syn](https://syn.tools/), leveraging Commodore Components like [component-rancher-monitoring](https://github.com/projectsyn/component-rancher-monitoring) which re-uses Prometheus Operator
-
----
-
-## <Insert Company/Organization Name>
-
-https://our-link.com/
-
-Environments: AWS, Azure, Google Cloud, Bare Metal, etc
-
-Uses [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus): Yes | No
-
-Details (optional):
-- HA Pair of Prometheus
-- 1000 samples/s (query: `rate(prometheus_tsdb_head_samples_appended_total[5m])`)
-- 10k active series (query: `prometheus_tsdb_head_series`)

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.48.1 / 2021-06-01
+
+* [BUGFIX] Added an `app` label on Prometheus pods. #4055
+
+## 0.48.0 / 2021-05-19
+
+Deprecation notice:  
+app labels will be removed in v0.50.
+
+* [CHANGE] Replace app label names with app.kubernetes.io/name. #3939
+* [CHANGE] Drop ksonnet as a dependency in jsonnetfile.json. #4002
+* [ENHANCEMENT] Add default container annotation to Alertmanager pod. #3978
+* [ENHANCEMENT] Add default container annotation to Thanos ruler pod. #3981
+* [ENHANCEMENT] Optimize asset secret update logic. #3986
+* [ENHANCEMENT] jsonnet: set default container in prometheus-operator pod. #3979
+* [BUGFIX] Watch configmaps from the Prometheus allowed namespaces only. #3992
+* [BUGFIX] Reconcile resources on namespace updates when using privileged lister/watcher. #3879
+* [BUGFIX] Don't generate broken Alertmanager configuration when `http_config` is defined in the global parameters. #4041
+
 ## 0.47.1 / 2021-04-30
 
 * [BUGFIX] Avoid reconciliations for Alertmanager statefulset on resource version changes. #3948

Documentation/network-policies.md

@@ -66,7 +66,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -93,7 +93,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 
 ```
 
@@ -134,7 +134,7 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: prometheus
+      app.kubernetes.io/name: prometheus
       prometheus: k8s
 ```
 

Documentation/rbac.md

@@ -28,7 +28,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -177,7 +177,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
   namespace: default
 ```
@@ -194,7 +194,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

Documentation/troubleshooting.md

@@ -50,7 +50,7 @@ When creating/deleting/modifying `ServiceMonitor` objects it is sometimes not as
 
 A common problem related to `ServiceMonitor` identification by Prometheus is related to an incorrect tagging, that does not match the `Prometheus` custom resource definition scope, or lack of permission for the Prometheus `ServiceAccount` to *get, list, watch* `Services` and `Endpoints` from the target application being monitored. As a general guideline consider the diagram below, giving an example of a `Deployment` and `Service` called `my-app`, being monitored by Prometheus based on a `ServiceMonitor` named `my-service-monitor`:
 
-![flow diagram](../custom-metrics-elements.png)
+![flow diagram](custom-metrics-elements.png)
 
 Note: The `ServiceMonitor` references a `Service` (not a `Deployment`, or a `Pod`), by labels *and* by the port name in the `Service`. This *port name* is optional in Kubernetes, but must be specified for the `ServiceMonitor` to work. It is not the same as the port name on the `Pod` or container, although it can be.
 

Documentation/user-guides/getting-started.md

@@ -264,7 +264,7 @@ Further reading:
 [bundle]: ../../bundle.yaml
 [design-doc]: ../design.md
 [exposing-prom]: exposing-prometheus-and-alertmanager.md
-[introducing-operators]: https://coreos.com/blog/introducing-operators.html
+[introducing-operators]: https://web.archive.org/web/20210210032403/https://coreos.com/blog/introducing-operators.html
 [prom-rbac]: ../rbac.md
 [prometheus-manifest]: ../../example/rbac/prometheus/prometheus.yaml
 [rbac-auth]: https://kubernetes.io/docs/reference/access-authn-authz/authorization/

Documentation/user-guides/monitoring-kubernetes-ingress.md

@@ -135,7 +135,7 @@ spec:
   routePrefix: /prometheus
   ruleSelector:
     matchLabels:
-      app: prometheus-operator
+      app.kubernetes.io/name: prometheus-operator
   serviceAccountName: prometheus-operator
   serviceMonitorSelector:
     matchLabels:

Documentation/user-guides/storage.md

@@ -74,7 +74,7 @@ spec:
       spec:
         selector:
           matchLabels:
-            app: my-example-prometheus
+            app.kubernetes.io/name: my-example-prometheus
         resources:
           requests:
             storage: 50Gi

MAINTAINERS.md

@@ -4,7 +4,7 @@
 |-----------------------|-----------------------------|--------------------------|---------------------------------------------------|-------------------|
 | Frederic Branczyk     | fbranczyk@gmail.com         | `@brancz`                | [@brancz](https://github.com/brancz)              | Polar Signals     |
 | Lili Cosic            | cosiclili@gmail.com         | `@lili`                  | [@lilic](https://github.com/lilic)                | Red Hat           |
-| Matthias Loibl        | mail@matthiasloibl.com      | `@metalmatze`            | [@metalmatze](https://github.com/metalmatze)      | Red Hat           |
+| Matthias Loibl        | mail@matthiasloibl.com      | `@metalmatze`            | [@metalmatze](https://github.com/metalmatze)      | Polar Signals     |
 | Paweł Krupa           | paulfantom@gmail.com        | `@paulfantom`            | [@paulfantom](https://github.com/paulfantom)      | Red Hat           |
 | Sergiusz Urbaniak     | sergiusz.urbaniak@gmail.com | `@sur`                   | [@s-urbaniak](https://github.com/s-urbaniak)      | Red Hat           |
 | Simon Pasquier        | pasquier.simon@gmail.com    | `@SimonPasquier`         | [@simonpasquier](https://github.com/simonpasquier)| Red Hat           |

RELEASE.md

@@ -15,8 +15,9 @@ Release cadence of first pre-releases being cut is 6 weeks.
 | v0.45   | 2021-01-13                                 | Lili Cosic (GitHub: @lilic)                 |
 | v0.46   | 2021-02-24                                 | Sergiusz Urbaniak (GitHub: @s-urbaniak)     |
 | v0.47   | 2021-04-07                                 | Simon Pasquier (GitHub: @simonpasquier)     |
-| v0.48   | 2021-05-19                                 | **searching for volunteer**                 |
-| v0.49   | 2021-06-30                                 | **searching for volunteer**                 |
+| v0.48   | 2021-05-19                                 | Matthias Loibl (GitHub: @metalmatze)        |
+| v0.49   | 2021-06-30                                 | Pawel Krupa (GitHub: @paulfantom)           |
+| v0.50   | 2021-08-11                                 | **searching for volunteer**                 |
 
 # How to cut a new release
 

VERSION

@@ -1 +1 @@
-0.47.1
+0.48.1

bundle.yaml

@@ -14047,7 +14047,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14064,7 +14064,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -14144,7 +14144,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
   namespace: default
 spec:
@@ -14155,16 +14155,18 @@ spec:
       app.kubernetes.io/name: prometheus-operator
   template:
     metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: prometheus-operator
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.47.1
+        app.kubernetes.io/version: 0.48.1
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.47.1
-        image: quay.io/prometheus-operator/prometheus-operator:v0.47.1
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1
+        image: quay.io/prometheus-operator/prometheus-operator:v0.48.1
         name: prometheus-operator
         ports:
         - containerPort: 8080
@@ -14191,7 +14193,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
   namespace: default
 ---
@@ -14201,7 +14203,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
   namespace: default
 spec:

cmd/operator/main.go

@@ -448,7 +448,10 @@ func Main() int {
 	srv := &http.Server{
 		Handler:   mux,
 		TLSConfig: tlsConfig,
-		ErrorLog:  stdlog.New(log.NewStdlibAdapter(logger), "", stdlog.LstdFlags),
+		// use flags on standard logger to align with base logger and get consistent parsed fields form adapter:
+		// use shortfile flag to get proper 'caller' field (avoid being wrongly parsed/extracted from message)
+		// and no datetime related flag to keep 'ts' field from base logger (with controlled format)
+		ErrorLog: stdlog.New(log.NewStdlibAdapter(logger), "", stdlog.Lshortfile),
 	}
 	if srv.TLSConfig == nil {
 		wg.Go(serve(srv, l, logger))

example/networkpolicies/alertmanager.yaml

@@ -11,7 +11,7 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -38,5 +38,5 @@ spec:
   podSelector:
     matchLabels:
       alertmanager: main
-      app: alertmanager
+      app.kubernetes.io/name: alertmanager
 

example/networkpolicies/prometheus.yaml

@@ -9,5 +9,5 @@ spec:
       protocol: TCP
   podSelector:
     matchLabels:
-      app: prometheus
-      prometheus: k8s
+      app.kubernetes.io/name: prometheus
+      prometheus: k8s

example/non-rbac/prometheus-operator.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
   namespace: default
 spec:
@@ -15,16 +15,18 @@ spec:
       app.kubernetes.io/name: prometheus-operator
   template:
     metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: prometheus-operator
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.47.1
+        app.kubernetes.io/version: 0.48.1
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.47.1
-        image: quay.io/prometheus-operator/prometheus-operator:v0.47.1
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.48.1
+        image: quay.io/prometheus-operator/prometheus-operator:v0.48.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.47.1
+    app.kubernetes.io/version: 0.48.1
   name: prometheus-operator
 rules:
 - apiGroups: