chore: drop check for AlertmanagerV1

Signed-off-by: Jan Fajerski <[email protected]>

Author: jan--f

pkg/manifests/config.go

@@ -53,7 +53,6 @@ const (
 	configKey = "config.yaml"
 )
 
-var errAlertmanagerV1NotSupported = errors.New("alertmanager's apiVersion=v1 is no longer supported, v2 has been available since Alertmanager 0.16.0")
 var reservedPrometheusExternalLabels = []string{"prometheus", "prometheus_replica", "cluster"}
 
 type Config struct {
@@ -202,31 +201,6 @@ func (u *UserWorkloadConfiguration) checkThanosRulerEvaluationInterval() error {
 	return nil
 }
 
-func (u *UserWorkloadConfiguration) checkAlertmanagerVersion() error {
-	if u.Prometheus != nil {
-		for _, amConfig := range u.Prometheus.AlertmanagerConfigs {
-			if alertmanagerV1(amConfig.APIVersion) {
-				return fmt.Errorf("%w: found in prometheus.additionalAlertmanagerConfigs", errAlertmanagerV1NotSupported)
-			}
-		}
-	}
-	if u.ThanosRuler != nil {
-		for _, amConfig := range u.ThanosRuler.AlertmanagersConfigs {
-			if alertmanagerV1(amConfig.APIVersion) {
-				return fmt.Errorf("%w: found in thanosRuler.additionalAlertmanagerConfigs", errAlertmanagerV1NotSupported)
-			}
-		}
-	}
-
-	return nil
-}
-
-func alertmanagerV1(version string) bool {
-	// Only meant to guide users by failing early in case v1 Alertmanager is still referenced,
-	// this is not meant to validate the apiVersion field.
-	return version == "v1"
-}
-
 func (u *UserWorkloadConfiguration) check() error {
 	if u == nil {
 		return nil
@@ -244,12 +218,6 @@ func (u *UserWorkloadConfiguration) check() error {
 		return err
 	}
 
-	// TODO: remove after 4.19
-	// Only to assist with the migration to Prometheus 3; fail early if Alertmanager v1 is still in use.
-	if err := u.checkAlertmanagerVersion(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -606,19 +574,6 @@ func (c *Config) LoadEnforcedBodySizeLimit(pcr PodCapacityReader, ctx context.Co
 	return nil
 }
 
-func (c *Config) checkAlertmanagerVersion() error {
-	if c.ClusterMonitoringConfiguration == nil || c.ClusterMonitoringConfiguration.PrometheusK8sConfig == nil {
-		return nil
-	}
-
-	for _, amConfig := range c.ClusterMonitoringConfiguration.PrometheusK8sConfig.AlertmanagerConfigs {
-		if alertmanagerV1(amConfig.APIVersion) {
-			return fmt.Errorf("%w: found in prometheusK8s.additionalAlertmanagerConfigs", errAlertmanagerV1NotSupported)
-		}
-	}
-	return nil
-}
-
 func (c *Config) Precheck() error {
 	if c.ClusterMonitoringConfiguration.PrometheusK8sConfig.CollectionProfile != FullCollectionProfile && !c.CollectionProfilesFeatureGateEnabled {
 		return fmt.Errorf("%w: collectionProfiles is currently a TechPreview feature behind the \"MetricsCollectionProfiles\" feature-gate, to be able to use a profile different from the default (\"full\") please enable it first", ErrConfigValidation)
@@ -647,12 +602,6 @@ func (c *Config) Precheck() error {
 	// Prometheus-Adapter is replaced with Metrics Server by default from 4.16
 	metrics.DeprecatedConfig.WithLabelValues("openshift-monitoring/cluster-monitoring-config", "k8sPrometheusAdapter", "4.16").Set(d)
 
-	// TODO: remove after 4.19
-	// Only to assist with the migration to Prometheus 3; fail early if Alertmanager v1 is still in use.
-	if err := c.checkAlertmanagerVersion(); err != nil {
-		return err
-	}
-
 	return nil
 }
 

pkg/manifests/config_test.go

@@ -278,85 +278,6 @@ thanosRuler:
 	}
 }
 
-// TestNewUserConfigFromStringUnsupportedAlertmanagerVersion is a temp test
-// TODO: remove after 4.19
-// Only to assist with the migration to Prometheus 3; fail early if Alertmanager v1 is still in use.
-func TestNewUserConfigFromStringUnsupportedAlertmanagerVersion(t *testing.T) {
-	tcs := []struct {
-		name         string
-		configString func() string
-		shouldFail   bool
-	}{
-		{
-			name: "unsupported alertmanager version in thanosRuler.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-thanosRuler:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v1`
-			},
-			shouldFail: true,
-		},
-		{
-			name: "unsupported alertmanager version in prometheus.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-prometheus:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v1`
-			},
-			shouldFail: true,
-		},
-		{
-			name: "supported alertmanager version in thanosRuler.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-thanosRuler:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v2`
-			},
-		},
-		{
-			name: "supported alertmanager version in prometheus.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-prometheus:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v2`
-			},
-		},
-		{
-			name: "default alertmanager version in thanosRuler.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-thanosRuler:
-  additionalAlertmanagerConfigs:
-    - scheme: foo`
-			},
-		},
-		{
-			name: "default alertmanager version in prometheus.additionalAlertmanagerConfigs",
-			configString: func() string {
-				return `
-prometheus:
-  additionalAlertmanagerConfigs:
-    - scheme: foo`
-			},
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := NewUserConfigFromString(tc.configString())
-			if tc.shouldFail {
-				require.ErrorIs(t, err, errAlertmanagerV1NotSupported)
-				return
-			}
-			require.NoError(t, err)
-		})
-	}
-}
-
 func TestTelemeterClientConfig(t *testing.T) {
 	truev, falsev := true, false
 
@@ -838,48 +759,3 @@ func TestDeprecatedConfig(t *testing.T) {
 		})
 	}
 }
-
-// TestUnsupportedAlertmanagerVersion is a temp test
-// TODO: remove after 4.19
-// Only to assist with the migration to Prometheus 3; fail early if Alertmanager v1 is still in use.
-func TestUnsupportedAlertmanagerVersion(t *testing.T) {
-	for _, tc := range []struct {
-		name       string
-		config     string
-		shouldFail bool
-	}{
-		{
-			name: "using unsupported Alertmanager v1 API",
-			config: `prometheusK8s:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v1
-  `,
-			shouldFail: true,
-		},
-		{
-			name: "using supported Alertmanager v2 API",
-			config: `prometheusK8s:
-  additionalAlertmanagerConfigs:
-    - apiVersion: v2
-  `,
-		},
-		{
-			name: "using default value",
-			config: `prometheusK8s:
-  additionalAlertmanagerConfigs:
-    - scheme: foo
-  `,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			c, err := NewConfigFromString(tc.config, true)
-			require.NoError(t, err)
-			err = c.Precheck()
-			if tc.shouldFail {
-				require.ErrorIs(t, err, errAlertmanagerV1NotSupported)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}