Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
MGDAPI-2072 - Address high CVEs discovered in grafana-operator image …
Browse files Browse the repository at this point in the history
…(used in RHOAM v1.8.0)
  • Loading branch information
valerymo committed Jun 28, 2021
1 parent 927efdf commit 933422b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
# You can delete this comment afterwards.
PROMETHEUS_OPERATOR_VERSION=v0.40.0
LOCAL=local
GRAFANA_OPERATOR_VERSION=v3.10.1
GRAFANA_OPERATOR_VERSION=v3.10.2
AMO_VERSION=1.6.0
PREV_AMO_VERSION=1.5.1

Expand Down
9 changes: 5 additions & 4 deletions pkg/controller/applicationmonitoring/templateHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import (
"crypto/rand"
"encoding/base64"
"fmt"
"github.com/Masterminds/sprig"
"github.com/ghodss/yaml"
"io/ioutil"
corev1 "k8s.io/api/core/v1"
"os"
"strings"
"text/template"

"github.com/Masterminds/sprig"
"github.com/ghodss/yaml"
corev1 "k8s.io/api/core/v1"

applicationmonitoring "github.com/integr8ly/application-monitoring-operator/pkg/apis/applicationmonitoring/v1alpha1"
"github.com/integr8ly/application-monitoring-operator/pkg/controller/common"
)
Expand Down Expand Up @@ -149,7 +150,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
ImageGrafana: "quay.io/openshift/origin-grafana",
ImageTagGrafana: "4.9",
ImageGrafanaOperator: "quay.io/integreatly/grafana-operator",
ImageTagGrafanaOperator: "v3.10.1",
ImageTagGrafanaOperator: "v3.10.2",
ImageConfigMapReloader: "quay.io/openshift/origin-configmap-reloader",
ImageTagConfigMapReloader: "4.9",
ImagePrometheusConfigReloader: "quay.io/openshift/origin-prometheus-config-reloader",
Expand Down

0 comments on commit 933422b

Please sign in to comment.