diff --git a/pkg/controller/autoops/configmap_test.go b/pkg/controller/autoops/configmap_test.go index 7573a79ddb1..f9ba090b4b4 100644 --- a/pkg/controller/autoops/configmap_test.go +++ b/pkg/controller/autoops/configmap_test.go @@ -166,7 +166,7 @@ func mkPolicy() autoopsv1alpha1.AutoOpsAgentPolicy { Namespace: "default", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", }, } } diff --git a/pkg/controller/autoops/expected_test.go b/pkg/controller/autoops/expected_test.go index 14b00de0992..6a70d8c6578 100644 --- a/pkg/controller/autoops/expected_test.go +++ b/pkg/controller/autoops/expected_test.go @@ -33,7 +33,7 @@ func TestReconcileAutoOpsAgentPolicy_deploymentParams(t *testing.T) { Namespace: "default", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0-SNAPSHOT", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "autoops-secret", }, diff --git a/pkg/controller/autoops/gc_test.go b/pkg/controller/autoops/gc_test.go index 5ef6182f365..52ad7d55bf9 100644 --- a/pkg/controller/autoops/gc_test.go +++ b/pkg/controller/autoops/gc_test.go @@ -89,7 +89,7 @@ func TestGarbageCollector_DoGarbageCollection(t *testing.T) { Namespace: namespace, }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", }, } } diff --git a/pkg/controller/autoops/reconcile_test.go b/pkg/controller/autoops/reconcile_test.go index 626a935a087..532dafa8427 100644 --- a/pkg/controller/autoops/reconcile_test.go +++ b/pkg/controller/autoops/reconcile_test.go @@ -76,7 +76,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "invalid-secret", }, @@ -107,7 +107,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -148,7 +148,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -184,7 +184,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -234,7 +234,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -291,7 +291,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -362,7 +362,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -452,7 +452,7 @@ func TestAutoOpsAgentPolicyReconciler_internalReconcile(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -722,7 +722,7 @@ func TestAutoOpsAgentPolicyReconciler_selectorChangeCleanup(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, @@ -938,7 +938,7 @@ func TestAutoOpsAgentPolicyReconciler_accessRevokedCleanup(t *testing.T) { Namespace: "ns-1", }, Spec: autoopsv1alpha1.AutoOpsAgentPolicySpec{ - Version: "9.1.0", + Version: "9.2.1", AutoOpsRef: autoopsv1alpha1.AutoOpsRef{ SecretName: "config-secret", }, diff --git a/pkg/controller/common/version/version.go b/pkg/controller/common/version/version.go index 248fc8ff314..3e496ab65b5 100644 --- a/pkg/controller/common/version/version.go +++ b/pkg/controller/common/version/version.go @@ -39,8 +39,9 @@ var ( SupportedPackageRegistryVersions = MinMaxVersion{Min: From(7, 17, 8), Max: From(9, 99, 99)} SupportedLogstashVersions = MinMaxVersion{Min: From(8, 12, 0), Max: From(9, 99, 99)} - // AutoOpsAgent was introduced in 9.1.0 and is supported on all 9.x versions. - SupportedAutoOpsAgentVersions = MinMaxVersion{Min: MustParse("9.1.0"), Max: From(9, 99, 99)} + // AutoOpsAgent was introduced in 9.1.0, but 9.2.1 is now required due to both performance optimizations + // and the lack of the healthcheckv2 extension prior to 9.2.1 which ECK utilizes. + SupportedAutoOpsAgentVersions = MinMaxVersion{Min: MustParse("9.2.1"), Max: From(9, 99, 99)} // minPreReleaseVersion is the lowest prerelease identifier as numeric prerelease takes precedence before // alphanumeric ones and it can't have leading zeros.