prometheus-operator config update

[knrt10]

Add user-configurable tolerations for prometheus operator and it's
components.

Change configuration for alertmanager. Now it is configured in a
different block

closes: #1527
Signed-off-by: knrt10 kautilya@kinvolk.io

Release notes

Alert manager is not configured as a different block

# old
alertmanager_retention    = "360h"
alertmanager_external_url = "https://api.example.com/alertmanager"
alertmanager_config       = file("alertmanager-config.yaml")
alertmanager_node_selector = {
  "kubernetes.io/hostname" = "worker3"
}

# new
alertmanager {
  retention    = "360h"
  external_url = "https://api.example.com/alertmanager"
  config       = file("alertmanager-config.yaml")
  node_selector = {
    "kubernetes.io/hostname" = "worker3"
  }
}

Operator is also now configured as a new block

# old
prometheus_operator_node_selector = {
  "kubernetes.io/hostname" = "worker3"
}

# new
operator {
  node_selector = {
    "kubernetes.io/hostname" = "worker3"
  }
}

[invidian]

Perhaps we could add some tests.

[invidian]

I wonder if we could somehow improve this experience for users. E.g. being able to identify what workloads are part of the component and then do some smart mapping to worker groups, so you don't have to specify those manually.

[knrt10]

@invidian do we want package tests or e2e test?

[invidian]

@invidian do we want package tests or e2e test?

I think having at least manifest rendering tests touching all new options would be good.

[invidian]

Just one more nit, otherwise looks good!

[invidian]

I suggest adding:

diff --git a/pkg/components/prometheus-operator/component_test.go b/pkg/components/prometheus-operator/component_test.go
index 93c2911a..c161b7d9 100644
--- a/pkg/components/prometheus-operator/component_test.go
+++ b/pkg/components/prometheus-operator/component_test.go
@@ -24,6 +24,8 @@ import (

 //nolint:funlen
 func TestRenderManifest(t *testing.T) {
+       t.Parallel()
+
        tests := []struct {
                desc    string
                hcl     string
@@ -143,6 +145,8 @@ component "prometheus-operator" {
        for _, tc := range tests {
                tc := tc
                t.Run(tc.desc, func(t *testing.T) {
+                       t.Parallel()
+
                        b, d := util.GetComponentBody(tc.hcl, Name)
                        if d != nil {
                                t.Fatalf("error getting component body: %v", d)
@@ -177,6 +181,8 @@ component "prometheus-operator" {

 //nolint:funlen
 func TestConversion(t *testing.T) {
+       t.Parallel()
+
        testCases := []struct {
                name                 string
                inputConfig          string

This cuts down test execution time from 14 seconds to 4 seconds on my machine. Still slow, but better.

[invidian]

Looks OK

[invidian]

@invidian I think you said Looks OK and submitted it via request changes. So had to request again smile

I only commented, not requested changes :) Changes looks good to me, but I think some other maintainer should have a look into it and approve it for merging.

[knrt10]

@invidian I think you said Looks OK and submitted it via request changes. So had to request again 😄

Addressed

[surajssd]

@knrt10 can you rebase on the current master the ARM issue will be solved.

[knrt10]

AWS is still failing on certificate rotation part.

[knrt10]

finally, yes