Skip to content

Commit da1f66e

Browse files
pregnorpregnor
committed
feat(IS): added ARM support for Monitoring #3394
Note: some of the image version changes involve breaking functionality change in the dependent service. It does not affect Pipeline, but it can potentially affect user experience thus should be mentioned among the release notes.
1 parent 9ebed53 commit da1f66e

File tree

5 files changed

+32
-19
lines changed

5 files changed

+32
-19
lines changed

‎config/config.yaml.dist

+7-6
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,17 @@ dex:
195195
#
196196
# charts:
197197
# operator:
198-
# chart: "stable/prometheus-operator"
199-
# version: "8.5.14"
198+
# chart: "prometheus-community/kube-prometheus-stack"
199+
# version: "12.11.3"
200200
#
201-
# # See https://github.com/helm/charts/tree/master/stable/prometheus-operator for details
201+
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack for details
202202
# values: {}
203203
#
204204
# pushgateway:
205-
# chart: "stable/prometheus-pushgateway"
206-
# version: "1.2.13"
205+
# chart: "prometheus-community/prometheus-pushgateway"
206+
# version: "1.5.1"
207207
#
208-
# # See https://github.com/helm/charts/tree/master/stable/prometheus-pushgateway for details
208+
# # See https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-pushgateway for details
209209
# values: {}
210210
#
211211
# logging:
@@ -424,6 +424,7 @@ dex:
424424
# bitnami: "https://charts.bitnami.com/bitnami"
425425
# loki: "https://grafana.github.io/loki/charts"
426426
# kubefed-charts: "https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts"
427+
# prometheus-community: "https://prometheus-community.github.io/helm-charts"
427428

428429
#cloud:
429430
# amazon:

‎internal/cmd/config.go

+12-11
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ func Configure(v *viper.Viper, p *pflag.FlagSet) {
573573
v.SetDefault("cluster::monitoring::enabled", true)
574574
v.SetDefault("cluster::monitoring::namespace", "")
575575
v.SetDefault("cluster::monitoring::grafana::adminUser", "admin")
576-
v.SetDefault("cluster::monitoring::charts::operator::chart", "stable/prometheus-operator")
577-
v.SetDefault("cluster::monitoring::charts::operator::version", "8.13.8")
576+
v.SetDefault("cluster::monitoring::charts::operator::chart", "prometheus-community/kube-prometheus-stack")
577+
v.SetDefault("cluster::monitoring::charts::operator::version", "12.11.3")
578578
v.SetDefault("cluster::monitoring::charts::operator::values", map[string]interface{}{
579579
"prometheus": map[string]interface{}{
580580
"ingress": map[string]interface{}{
@@ -608,21 +608,21 @@ func Configure(v *viper.Viper, p *pflag.FlagSet) {
608608
},
609609
},
610610
})
611-
v.SetDefault("cluster::monitoring::images::operator::repository", "quay.io/coreos/prometheus-operator")
612-
v.SetDefault("cluster::monitoring::images::operator::tag", "v0.34.0")
611+
v.SetDefault("cluster::monitoring::images::operator::repository", "quay.io/prometheus-operator/prometheus-operator")
612+
v.SetDefault("cluster::monitoring::images::operator::tag", "v0.44.1")
613613
v.SetDefault("cluster::monitoring::images::prometheus::repository", "quay.io/prometheus/prometheus")
614-
v.SetDefault("cluster::monitoring::images::prometheus::tag", "v2.13.1")
614+
v.SetDefault("cluster::monitoring::images::prometheus::tag", "v2.22.1")
615615
v.SetDefault("cluster::monitoring::images::alertmanager::repository", "quay.io/prometheus/alertmanager")
616-
v.SetDefault("cluster::monitoring::images::alertmanager::tag", "v0.19.0")
616+
v.SetDefault("cluster::monitoring::images::alertmanager::tag", "v0.21.0")
617617
v.SetDefault("cluster::monitoring::images::grafana::repository", "grafana/grafana")
618-
v.SetDefault("cluster::monitoring::images::grafana::tag", "6.5.2")
618+
v.SetDefault("cluster::monitoring::images::grafana::tag", "7.3.5")
619619
v.SetDefault("cluster::monitoring::images::kubestatemetrics::repository", "quay.io/coreos/kube-state-metrics")
620-
v.SetDefault("cluster::monitoring::images::kubestatemetrics::tag", "v1.9.3")
620+
v.SetDefault("cluster::monitoring::images::kubestatemetrics::tag", "v1.9.7")
621621
v.SetDefault("cluster::monitoring::images::nodeexporter::repository", "quay.io/prometheus/node-exporter")
622-
v.SetDefault("cluster::monitoring::images::nodeexporter::tag", "v0.18.1")
622+
v.SetDefault("cluster::monitoring::images::nodeexporter::tag", "v1.0.1")
623623

624-
v.SetDefault("cluster::monitoring::charts::pushgateway::chart", "stable/prometheus-pushgateway")
625-
v.SetDefault("cluster::monitoring::charts::pushgateway::version", "1.2.13")
624+
v.SetDefault("cluster::monitoring::charts::pushgateway::chart", "prometheus-community/prometheus-pushgateway")
625+
v.SetDefault("cluster::monitoring::charts::pushgateway::version", "1.5.1")
626626
v.SetDefault("cluster::monitoring::charts::pushgateway::values", map[string]interface{}{})
627627
v.SetDefault("cluster::monitoring::images::pushgateway::repository", "prom/pushgateway")
628628
v.SetDefault("cluster::monitoring::images::pushgateway::tag", "v1.0.1")
@@ -877,6 +877,7 @@ traefik:
877877
v.SetDefault("helm::repositories::bitnami", "https://charts.bitnami.com/bitnami")
878878
v.SetDefault("helm::repositories::loki", "https://grafana.github.io/loki/charts")
879879
v.SetDefault("helm::repositories::kubefed-charts", "https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/charts")
880+
v.SetDefault("helm::repositories::prometheus-community", "https://prometheus-community.github.io/helm-charts")
880881

881882
// Cloud configuration
882883
v.SetDefault("cloud::amazon::defaultRegion", "us-west-1")

‎internal/helm/integration_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ func testIntegrationInstall(t *testing.T) {
9898
config := helm.Config{
9999
Home: home,
100100
Repositories: map[string]string{
101-
"stable": "https://charts.helm.sh/stable",
102-
"banzaicloud-stable": "https://kubernetes-charts.banzaicloud.com",
101+
"stable": "https://charts.helm.sh/stable",
102+
"banzaicloud-stable": "https://kubernetes-charts.banzaicloud.com",
103+
"prometheus-community": "https://prometheus-community.github.io/helm-charts",
103104
},
104105
}
105106

‎internal/helm/service_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ func Test_service_ListRepositories(t *testing.T) {
236236
Name: "loki",
237237
URL: "https://grafana.github.io/loki/charts",
238238
},
239+
{
240+
Name: "prometheus-community",
241+
URL: "https://prometheus-community.github.io/helm-charts",
242+
},
239243
},
240244
setupMocks: func(store *Store, secretStore *SecretStore, envResolver *EnvResolver, envService *EnvService, arguments args) {
241245
storeMock := (*store).(*MockStore)
@@ -263,6 +267,10 @@ func Test_service_ListRepositories(t *testing.T) {
263267
Name: "loki",
264268
URL: "https://grafana.github.io/loki/charts",
265269
},
270+
{
271+
Name: "prometheus-community",
272+
URL: "https://prometheus-community.github.io/helm-charts",
273+
},
266274
},
267275
nil,
268276
)

‎internal/integratedservices/services/monitoring/operator.go

+2
Original file line numberDiff line numberDiff line change
@@ -800,8 +800,10 @@ func (op IntegratedServiceOperator) getDefaultStorageClassName(ctx context.Conte
800800
func (op IntegratedServiceOperator) cleanupCRDs(ctx context.Context, clusterID uint) error {
801801
// list with the monitoring related CRDs
802802
crdNames := []string{
803+
"alertmanagerconfigs.monitoring.coreos.com",
803804
"alertmanagers.monitoring.coreos.com",
804805
"podmonitors.monitoring.coreos.com",
806+
"probes.monitoring.coreos.com",
805807
"prometheuses.monitoring.coreos.com",
806808
"prometheusrules.monitoring.coreos.com",
807809
"servicemonitors.monitoring.coreos.com",

0 commit comments

Comments
 (0)