Bump Grafana image to 8.0.6-ubuntu #3481

sayf-eddine-scality · 2021-08-04T16:09:53Z

We moved to Ubuntu-based image because the Alpine-based image
handle DNS SERVFAIL errors poorly.

Grafana image tag set to 8.0.6-ubuntu then

./charts/render.py prometheus-operator \
      charts/kube-prometheus-stack.yaml \
      charts/kube-prometheus-stack/ \
      --namespace metalk8s-monitoring \
      --service-config grafana \
      metalk8s-grafana-config \
      metalk8s/addons/prometheus-operator/config/grafana.yaml \
      metalk8s-monitoring \
      --service-config prometheus \
      metalk8s-prometheus-config \
      metalk8s/addons/prometheus-operator/config/prometheus.yaml \
      metalk8s-monitoring \
      --service-config alertmanager \
      metalk8s-alertmanager-config \
      metalk8s/addons/prometheus-operator/config/alertmanager.yaml \
      metalk8s-monitoring \
      --service-config dex \
      metalk8s-dex-config \
      metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \
      --drop-prometheus-rules charts/drop-prometheus-rules.yaml \
      > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls

Refs: #3480

Component:

Context:

Summary:

Acceptance criteria:

Closes: #3480

bert-e · 2021-08-04T16:09:55Z

Hello sayf-eddine-scality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-08-04T16:10:00Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/Use-ubuntu-based-grafana into
development/2.10
w/2.11/bugfix/Use-ubuntu-based-grafana will be merged into development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-08-04T16:10:03Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

gdemonet · 2021-08-04T17:24:07Z

charts/kube-prometheus-stack/charts/grafana/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 8.0.1
+appVersion: 8.0.6-ubuntu


We shouldn't change files within the chart (it's imported from upstream), can't we override the image version from the values file?

It looks like setting grafana.image.tag to 8.0.6-ubuntu in charts/kube-prometheus-stack.yaml should be sufficient.

I tested it, will do

We moved to Ubuntu-based image because the Alpine-based image handle DNS SERVFAIL errors poorly. Grafana image tag set to 8.0.6-ubuntu then ``` ./charts/render.py prometheus-operator \ charts/kube-prometheus-stack.yaml \ charts/kube-prometheus-stack/ \ --namespace metalk8s-monitoring \ --service-config grafana \ metalk8s-grafana-config \ metalk8s/addons/prometheus-operator/config/grafana.yaml \ metalk8s-monitoring \ --service-config prometheus \ metalk8s-prometheus-config \ metalk8s/addons/prometheus-operator/config/prometheus.yaml \ metalk8s-monitoring \ --service-config alertmanager \ metalk8s-alertmanager-config \ metalk8s/addons/prometheus-operator/config/alertmanager.yaml \ metalk8s-monitoring \ --service-config dex \ metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ --drop-prometheus-rules charts/drop-prometheus-rules.yaml \ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls ``` Refs: #3480

bert-e · 2021-08-04T18:00:33Z

History mismatch

Merge commit #28f8963685b6110133b2bee5f9d36dc3b2358e7a on the integration branch
w/2.11/bugfix/Use-ubuntu-based-grafana is merging a branch which is neither the current
branch bugfix/Use-ubuntu-based-grafana nor the development branch
development/2.11.

It is likely due to a rebase of the branch bugfix/Use-ubuntu-based-grafana and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

sayf-eddine-scality · 2021-08-04T18:00:57Z

/reset

bert-e · 2021-08-04T18:01:03Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-08-04T18:01:09Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/Use-ubuntu-based-grafana into
development/2.10
w/2.11/bugfix/Use-ubuntu-based-grafana will be merged into development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-08-04T18:01:10Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

sayf-eddine-scality · 2021-08-05T09:46:40Z

/approve

bert-e · 2021-08-05T09:46:48Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.10
✔️ development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2021-08-05T14:37:24Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.10
✔️ development/2.11

The following branches have NOT changed:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye sayf-eddine-scality.

Refs: #3469 Refs: #3477 Refs: #3481 Refs: #3479 Refs: #3484 Refs: #3483

sayf-eddine-scality added this to the MetalK8s 2.10.1 milestone Aug 4, 2021

sayf-eddine-scality requested a review from a team August 4, 2021 16:09

gdemonet reviewed Aug 4, 2021

View reviewed changes

sayf-eddine-scality force-pushed the bugfix/Use-ubuntu-based-grafana branch from 28f8963 to 99b0e93 Compare August 4, 2021 18:00

gdemonet approved these changes Aug 5, 2021

View reviewed changes

alexandre-allard approved these changes Aug 5, 2021

View reviewed changes

bert-e merged commit 932c181 into development/2.10 Aug 5, 2021

bert-e deleted the bugfix/Use-ubuntu-based-grafana branch August 5, 2021 14:37

gdemonet mentioned this pull request Aug 5, 2021

Use Ubuntu-based grafana image instead of the alpine image #3480

Closed

gdemonet added a commit that referenced this pull request Aug 5, 2021

changelog: Update for 2.10.1 release

60f8cb3

Refs: #3469 Refs: #3477 Refs: #3481 Refs: #3479 Refs: #3484 Refs: #3483

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Grafana image to 8.0.6-ubuntu #3481

Bump Grafana image to 8.0.6-ubuntu #3481

sayf-eddine-scality commented Aug 4, 2021

bert-e commented Aug 4, 2021

bert-e commented Aug 4, 2021

bert-e commented Aug 4, 2021

gdemonet Aug 4, 2021

gdemonet Aug 4, 2021

sayf-eddine-scality Aug 4, 2021

bert-e commented Aug 4, 2021

sayf-eddine-scality commented Aug 4, 2021

bert-e commented Aug 4, 2021

bert-e commented Aug 4, 2021

bert-e commented Aug 4, 2021

sayf-eddine-scality commented Aug 5, 2021

bert-e commented Aug 5, 2021

bert-e commented Aug 5, 2021

Bump Grafana image to 8.0.6-ubuntu #3481

Bump Grafana image to 8.0.6-ubuntu #3481

Conversation

sayf-eddine-scality commented Aug 4, 2021

bert-e commented Aug 4, 2021

Hello sayf-eddine-scality,

bert-e commented Aug 4, 2021

Integration data created

bert-e commented Aug 4, 2021

Waiting for approval

gdemonet Aug 4, 2021

Choose a reason for hiding this comment

gdemonet Aug 4, 2021

Choose a reason for hiding this comment

sayf-eddine-scality Aug 4, 2021

Choose a reason for hiding this comment

bert-e commented Aug 4, 2021

History mismatch

sayf-eddine-scality commented Aug 4, 2021

bert-e commented Aug 4, 2021

Reset complete

bert-e commented Aug 4, 2021

Integration data created

bert-e commented Aug 4, 2021

Waiting for approval

sayf-eddine-scality commented Aug 5, 2021

bert-e commented Aug 5, 2021

In the queue

bert-e commented Aug 5, 2021