[kube-prometheus-stack] Update prometheus-operator to 0.42.1 #128

bashofmann · 2020-09-22T14:02:52Z

What this PR does / why we need it:

Update prometheus-operator to 0.42.1.

This also introduces a new Probes CRD. Since Helm does not create this new CRD on a chart upgrade automatically, the chart version is bumped to 10 to indicate the breaking change.

Checklist

DCO signed
Chart Version bumped
Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

cablespaghetti · 2020-09-24T10:28:54Z

Would love for this to get merged. I've done this by hand by bumping image versions and deploying the CRDs by hand but the lack of "probes" in the ClusterRole makes things difficult.

tiagomeireles · 2020-09-25T12:46:06Z

This also bumps the kubernetes prerequisite to 1.16+. prometheus-operator 0.39 introduced a requirement for kubernetes v1.16 or newer. https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.39.0

I'm +1 with getting this merged in.

bashofmann · 2020-09-25T13:18:51Z

What do you think, should I add a kubeVersion field in the Chart.yaml to restrict this?

bashofmann · 2020-09-27T10:57:28Z

kubeVersion requirement is added.

scottrigby · 2020-09-27T12:25:42Z

Related to #24

scottrigby · 2020-09-27T12:31:21Z

Have these CRDs been updated in the upstream https://github.com/prometheus-operator/kube-prometheus project? This may be a question for @brancz

bashofmann · 2020-09-27T14:32:01Z

I took the CRDs in this PR directly from here: https://github.com/prometheus-operator/prometheus-operator/tree/v0.42.1/example/prometheus-operator-crd

scottrigby · 2020-09-27T19:17:48Z

@bashofmann OK thanks yes, it appears the source – generated as part of the prometheus-operator/kube-prometheus project (which this chart installs) – is here: https://github.com/prometheus-operator/kube-prometheus/tree/master/manifests/setup

These were updated recently upstream:

to 0.42.0 Update dependencies and most importantly Prometheus Operator to v0.42.0 prometheus-operator/kube-prometheus#674
to 0.42.1 Bump to prometheus-operator 0.42.1 and update all deps prometheus-operator/kube-prometheus#685

Which is interesting to me. I wonder:

why the chart README recommends installing directly from https://raw.githubusercontent.com/prometheus-operator/prometheus-operator as opposed to from the kube-prometheus generated manifests
and why the chart crds dir files have similar comments listing prometheus-operator/prometheus-operator as the file source
Also, this chart's hack dir has sync scripts for grafana dashboards and prom rules, but not for CRDs – should it?

Maybe some of the other kube-prometheus project maintainers can help me understand if these are just relics/gaps left over from the stable chart, or if there is some reason. Either way I think we can clean this up and decide on a nicer path forward to keep better in sync with the upstream kube-prometheus project. CC @metalmatze @paulfantom @lilic

bashofmann · 2020-09-27T20:56:46Z

Are you sure that kube-prometheus is the source of truth for the CRDs? It feels more logical to me that the source of truth is in prometheus-operator which uses and implements logic for these CRDs and not in kube-prometheus which bundles the operator with monitors, dashboards and rules.

paulfantom · 2020-09-28T07:54:35Z

The source of truth for CRDs is their jsonnet definition in prometheus-operator repository, this is used to generate yaml files in prometheus-operator and it is also consumed by kube-prometheus.

Note: jsonnet code is also generated from go code using generate-crd.go script.

Nuru · 2020-09-30T17:59:00Z

This chart fails on AWS EKS and probably fails on GKE due to the kubeVersion constraint:

Error: UPGRADE FAILED: chart requires kubeVersion: >=1.16.0 which is incompatible with Kubernetes v1.17.9-eks-4c6976

Solution appears to be to change the constraint to >=1.16.0-0. See helm/helm#3810 (comment) and this documentation

bashofmann · 2020-10-01T09:32:45Z

Thanks, good catch. I fixed the constraint and rebased the PR.

deleted · 2020-10-02T23:21:26Z

I would also love to see this PR land, as prometheus-operator v0.39 added support to enable the prometheus query logger.

uptickmetachu · 2020-10-06T03:36:10Z

(Also keenly interested in this one for black box exporter)

bashofmann · 2020-10-06T08:04:12Z

@scottrigby Is there anything else this PR needs besides the obvious rebase?

charts/kube-prometheus-stack/values.yaml

monotek

resolve merge conflict please

bashofmann · 2020-10-07T08:40:33Z

I rebased the branch again to resolve conflicts.

bashofmann · 2020-10-08T08:09:16Z

The lint task seems to have failed due to a network hickup. Is there a way to rerun it (with the right permissions), or do I need to make a tiny change and push again?

monotek

@bashofmann

Could you merge the changes from master to your branch introduced by #191 please?
After that linting should succeed :)

This also introduces a new `Probes` CRD. Since Helm does not create this new CRD on a chart upgrade automatically, the chart version is bumped to 10 to indicate the breaking change. Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

…rRole Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

….clusterAdvertiseAddress Introduced in 0.39.0 with prometheus-operator/prometheus-operator#3160 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

Introduced in 0.41.0 with prometheus-operator/prometheus-operator#3334 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

Compatibility added in in 0.41.0 with prometheus-operator/prometheus-operator#3316 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

…rtiseAddress Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

bashofmann · 2020-10-09T07:47:22Z

@monotek rebased and pushed

scottrigby

Thanks for your work on this

…eus-community#128) * [kube-prometheus-stack] Update prometheus-operator to 0.42.1 This also introduces a new `Probes` CRD. Since Helm does not create this new CRD on a chart upgrade automatically, the chart version is bumped to 10 to indicate the breaking change. Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Remove duplicated podmonitors entry in ClusterRole Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Add support for alertmanager.alertmanagerSpec.clusterAdvertiseAddress Introduced in 0.39.0 with prometheus-operator/prometheus-operator#3160 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Update configmap-reload to 0.4.0 Introduced in 0.41.0 with prometheus-operator/prometheus-operator#3334 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Update default prometheus version to 2.19.2 Compatibility added in in 0.41.0 with prometheus-operator/prometheus-operator#3316 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Fix alertmanager.alertmanagerSpec.clusterAdvertiseAddress Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Fix kubeVersion constraint for GKE and EKS Signed-off-by: Bastian Hofmann <bashofmann@gmail.com> * [kube-prometheus-stack] Update Prometheus to 2.21.0 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

bashofmann requested review from bismarck, gianrubio, gkarthiks, scottrigby, vsliouniaev and Xtigyro as code owners September 22, 2020 14:02

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 8000b7a to 0219394 Compare September 22, 2020 14:07

bashofmann mentioned this pull request Sep 23, 2020

Add ability to specify trustedCA(or use existing from Rancher installation) in Notifier webhook options rancher/rancher#24272

Closed

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 0219394 to 96d1037 Compare September 27, 2020 10:43

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 9a9284a to eb813c3 Compare September 28, 2020 07:37

bashofmann force-pushed the prometheus-operator-0.42.1 branch from f3d2663 to 03fba17 Compare October 1, 2020 09:32

monotek reviewed Oct 6, 2020

View reviewed changes

charts/kube-prometheus-stack/values.yaml Outdated Show resolved Hide resolved

monotek requested changes Oct 6, 2020

View reviewed changes

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 03fba17 to b9546f9 Compare October 6, 2020 08:40

monotek previously approved these changes Oct 6, 2020

View reviewed changes

bashofmann dismissed monotek’s stale review via 554e13f October 7, 2020 08:39

bashofmann force-pushed the prometheus-operator-0.42.1 branch from b9546f9 to 554e13f Compare October 7, 2020 08:39

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 554e13f to 31df5b6 Compare October 8, 2020 06:51

monotek requested changes Oct 8, 2020

View reviewed changes

bashofmann added 8 commits October 9, 2020 09:46

[kube-prometheus-stack] Remove duplicated podmonitors entry in Cluste…

8725038

…rRole Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Add support for alertmanager.alertmanagerSpec…

5722160

….clusterAdvertiseAddress Introduced in 0.39.0 with prometheus-operator/prometheus-operator#3160 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Update configmap-reload to 0.4.0

3c3a1ca

Introduced in 0.41.0 with prometheus-operator/prometheus-operator#3334 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Update default prometheus version to 2.19.2

5d8c1ce

Compatibility added in in 0.41.0 with prometheus-operator/prometheus-operator#3316 Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Fix alertmanager.alertmanagerSpec.clusterAdve…

d56c725

…rtiseAddress Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Fix kubeVersion constraint for GKE and EKS

186c99a

Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

[kube-prometheus-stack] Update Prometheus to 2.21.0

19f327c

Signed-off-by: Bastian Hofmann <bashofmann@gmail.com>

bashofmann force-pushed the prometheus-operator-0.42.1 branch from 31df5b6 to 19f327c Compare October 9, 2020 07:46

monotek approved these changes Oct 9, 2020

View reviewed changes

scottrigby approved these changes Oct 9, 2020

View reviewed changes

scottrigby merged commit eccf50d into prometheus-community:main Oct 9, 2020

bashofmann deleted the prometheus-operator-0.42.1 branch October 10, 2020 08:08

bashofmann mentioned this pull request Oct 19, 2020

Bump to latest prometheus v2.21.0 #188

Closed

scottrigby mentioned this pull request Dec 8, 2020

Removing extensions/v1beta1 since deprecated #431

Closed

3 tasks

xairos mentioned this pull request Sep 29, 2021

Fix/add Helm deploy support for GKE and EKS slok/sloth#170

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[kube-prometheus-stack] Update prometheus-operator to 0.42.1 #128

[kube-prometheus-stack] Update prometheus-operator to 0.42.1 #128

bashofmann commented Sep 22, 2020

cablespaghetti commented Sep 24, 2020

tiagomeireles commented Sep 25, 2020

bashofmann commented Sep 25, 2020

bashofmann commented Sep 27, 2020

scottrigby commented Sep 27, 2020

scottrigby commented Sep 27, 2020

bashofmann commented Sep 27, 2020

scottrigby commented Sep 27, 2020

bashofmann commented Sep 27, 2020

paulfantom commented Sep 28, 2020 •

edited

Loading

Nuru commented Sep 30, 2020

bashofmann commented Oct 1, 2020

deleted commented Oct 2, 2020

uptickmetachu commented Oct 6, 2020

bashofmann commented Oct 6, 2020

monotek left a comment

bashofmann commented Oct 7, 2020

bashofmann commented Oct 8, 2020

monotek left a comment

bashofmann commented Oct 9, 2020

scottrigby left a comment

[kube-prometheus-stack] Update prometheus-operator to 0.42.1 #128

[kube-prometheus-stack] Update prometheus-operator to 0.42.1 #128

Conversation

bashofmann commented Sep 22, 2020

What this PR does / why we need it:

Checklist

cablespaghetti commented Sep 24, 2020

tiagomeireles commented Sep 25, 2020

bashofmann commented Sep 25, 2020

bashofmann commented Sep 27, 2020

scottrigby commented Sep 27, 2020

scottrigby commented Sep 27, 2020

bashofmann commented Sep 27, 2020

scottrigby commented Sep 27, 2020

bashofmann commented Sep 27, 2020

paulfantom commented Sep 28, 2020 • edited Loading

Nuru commented Sep 30, 2020

bashofmann commented Oct 1, 2020

deleted commented Oct 2, 2020

uptickmetachu commented Oct 6, 2020

bashofmann commented Oct 6, 2020

monotek left a comment

Choose a reason for hiding this comment

bashofmann commented Oct 7, 2020

bashofmann commented Oct 8, 2020

monotek left a comment

Choose a reason for hiding this comment

bashofmann commented Oct 9, 2020

scottrigby left a comment

Choose a reason for hiding this comment

paulfantom commented Sep 28, 2020 •

edited

Loading