diff --git a/config/crd/bases/dynatrace.com_dynakubes.yaml b/config/crd/bases/dynatrace.com_dynakubes.yaml index daa42df451..14aed71dad 100644 --- a/config/crd/bases/dynatrace.com_dynakubes.yaml +++ b/config/crd/bases/dynatrace.com_dynakubes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: dynakubes.dynatrace.com spec: group: dynatrace.com @@ -5003,13 +5003,8 @@ spec: type: boolean extensions: properties: - prometheus: - properties: - enabled: - type: boolean - required: - - enabled - type: object + enabled: + type: boolean type: object logModule: description: General configuration about the LogModule feature. diff --git a/config/crd/bases/dynatrace.com_edgeconnects.yaml b/config/crd/bases/dynatrace.com_edgeconnects.yaml index 9e7922b281..f366d77faf 100644 --- a/config/crd/bases/dynatrace.com_edgeconnects.yaml +++ b/config/crd/bases/dynatrace.com_edgeconnects.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: edgeconnects.dynatrace.com spec: group: dynatrace.com diff --git a/config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml b/config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml index 672cee5633..def9c949a8 100644 --- a/config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml +++ b/config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: dynakubes.dynatrace.com spec: conversion: @@ -5015,13 +5015,8 @@ spec: type: boolean extensions: properties: - prometheus: - properties: - enabled: - type: boolean - required: - - enabled - type: object + enabled: + type: boolean type: object logModule: description: General configuration about the LogModule feature. @@ -7363,7 +7358,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: edgeconnects.dynatrace.com spec: conversion: diff --git a/doc/api/dynakube-api-ref.md b/doc/api/dynakube-api-ref.md index c7876e2a0e..cb73e14478 100644 --- a/doc/api/dynakube-api-ref.md +++ b/doc/api/dynakube-api-ref.md @@ -46,6 +46,12 @@ |`tolerations`|Set tolerations for the ActiveGate pods|-|array| |`topologySpreadConstraints`|Adds TopologySpreadConstraints for the ActiveGate pods|-|array| +### .spec.extensions + +|Parameter|Description|Default value|Data type| +|:-|:-|:-|:-| +|`enabled`||-|boolean| + ### .spec.metadataEnrichment |Parameter|Description|Default value|Data type| @@ -67,12 +73,6 @@ |`secCompProfile`|The SecComp Profile that will be configured in order to run in secure computing mode for the LogModule pods|-|string| |`tolerations`|Set tolerations for the LogModule pods|-|array| -### .spec.extensions.prometheus - -|Parameter|Description|Default value|Data type| -|:-|:-|:-|:-| -|`enabled`||-|boolean| - ### .spec.oneAgent.hostMonitoring |Parameter|Description|Default value|Data type| diff --git a/pkg/api/v1beta3/dynakube/extensions.go b/pkg/api/v1beta3/dynakube/extensions.go index ba5327cb86..78e940b30d 100644 --- a/pkg/api/v1beta3/dynakube/extensions.go +++ b/pkg/api/v1beta3/dynakube/extensions.go @@ -7,11 +7,7 @@ import ( type ExtensionsSpec struct { // +kubebuilder:validation:Optional - Prometheus PrometheusSpec `json:"prometheus,omitempty"` -} - -type PrometheusSpec struct { - Enabled bool `json:"enabled"` + Enabled bool `json:"enabled,omitempty"` } type ExtensionExecutionControllerSpec struct { diff --git a/pkg/api/v1beta3/dynakube/extensions_props.go b/pkg/api/v1beta3/dynakube/extensions_props.go index 893534afdb..d5c9a7c474 100644 --- a/pkg/api/v1beta3/dynakube/extensions_props.go +++ b/pkg/api/v1beta3/dynakube/extensions_props.go @@ -6,9 +6,5 @@ const ( ) func (dk *DynaKube) IsExtensionsEnabled() bool { - return dk.Spec.Extensions.Prometheus.Enabled -} - -func (dk *DynaKube) PrometheusEnabled() bool { - return dk.Spec.Extensions.Prometheus.Enabled + return dk.Spec.Extensions.Enabled } diff --git a/pkg/api/v1beta3/dynakube/validation/eec.go b/pkg/api/v1beta3/dynakube/validation/eec.go index 0ac6166b2e..5260c8a453 100644 --- a/pkg/api/v1beta3/dynakube/validation/eec.go +++ b/pkg/api/v1beta3/dynakube/validation/eec.go @@ -9,8 +9,8 @@ const ( errorExtensionExecutionControllerImageNotSpecified = `DynaKube's specification enables the Prometheus feature, make sure you correctly specify the ExtensionExecutionController image.` ) -func extensionControllerImage(ctx context.Context, dv *Validator, dk *dynakube.DynaKube) string { - if !dk.PrometheusEnabled() { +func extensionControllerImage(_ context.Context, _ *Validator, dk *dynakube.DynaKube) string { + if !dk.IsExtensionsEnabled() { return "" } diff --git a/pkg/api/v1beta3/dynakube/validation/eec_test.go b/pkg/api/v1beta3/dynakube/validation/eec_test.go index c4947fc87f..6c33d349c0 100644 --- a/pkg/api/v1beta3/dynakube/validation/eec_test.go +++ b/pkg/api/v1beta3/dynakube/validation/eec_test.go @@ -14,9 +14,7 @@ func TestExtensionExecutionControllerImage(t *testing.T) { Spec: dynakube.DynaKubeSpec{ APIURL: testApiUrl, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, Templates: dynakube.TemplatesSpec{ ExtensionExecutionController: dynakube.ExtensionExecutionControllerSpec{ @@ -38,9 +36,7 @@ func TestExtensionExecutionControllerImage(t *testing.T) { Spec: dynakube.DynaKubeSpec{ APIURL: testApiUrl, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, Templates: dynakube.TemplatesSpec{ ExtensionExecutionController: dynakube.ExtensionExecutionControllerSpec{ @@ -61,9 +57,7 @@ func TestExtensionExecutionControllerImage(t *testing.T) { Spec: dynakube.DynaKubeSpec{ APIURL: testApiUrl, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, Templates: dynakube.TemplatesSpec{ ExtensionExecutionController: dynakube.ExtensionExecutionControllerSpec{ @@ -84,9 +78,7 @@ func TestExtensionExecutionControllerImage(t *testing.T) { Spec: dynakube.DynaKubeSpec{ APIURL: testApiUrl, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, }) diff --git a/pkg/api/v1beta3/dynakube/zz_generated.deepcopy.go b/pkg/api/v1beta3/dynakube/zz_generated.deepcopy.go index 4a309b8551..80a72e285f 100644 --- a/pkg/api/v1beta3/dynakube/zz_generated.deepcopy.go +++ b/pkg/api/v1beta3/dynakube/zz_generated.deepcopy.go @@ -496,7 +496,6 @@ func (in *ExtensionExecutionControllerSpec) DeepCopy() *ExtensionExecutionContro // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ExtensionsSpec) DeepCopyInto(out *ExtensionsSpec) { *out = *in - out.Prometheus = in.Prometheus } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExtensionsSpec. @@ -835,21 +834,6 @@ func (in *OpenTelemetryCollectorSpec) DeepCopy() *OpenTelemetryCollectorSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PrometheusSpec) DeepCopyInto(out *PrometheusSpec) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PrometheusSpec. -func (in *PrometheusSpec) DeepCopy() *PrometheusSpec { - if in == nil { - return nil - } - out := new(PrometheusSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TemplatesSpec) DeepCopyInto(out *TemplatesSpec) { *out = *in diff --git a/pkg/controllers/dynakube/activegate/capability/capability_test.go b/pkg/controllers/dynakube/activegate/capability/capability_test.go index 81f06b6d8f..b101293d8a 100644 --- a/pkg/controllers/dynakube/activegate/capability/capability_test.go +++ b/pkg/controllers/dynakube/activegate/capability/capability_test.go @@ -38,9 +38,7 @@ func buildDynakube(capabilities []dynakube.CapabilityDisplayName, enableExtensio Capabilities: capabilities, }, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: enableExtensions, - }, + Enabled: enableExtensions, }, }, } diff --git a/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec.go b/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec.go index f7163cac71..fd6a6cb733 100644 --- a/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec.go +++ b/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec.go @@ -32,7 +32,7 @@ type EecModifier struct { } func (mod EecModifier) Enabled() bool { - return mod.dk.PrometheusEnabled() + return mod.dk.IsExtensionsEnabled() } func (mod EecModifier) Modify(sts *appsv1.StatefulSet) error { diff --git a/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec_test.go b/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec_test.go index 166a9e366b..6bb987e08b 100644 --- a/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec_test.go +++ b/pkg/controllers/dynakube/activegate/internal/statefulset/builder/modifiers/eec_test.go @@ -8,18 +8,18 @@ import ( ) func TestEecEnabled(t *testing.T) { - t.Run("Prometheus extension is enabled", func(t *testing.T) { + t.Run("Extensions are enabled", func(t *testing.T) { dk := getBaseDynakube() - dk.Spec.Extensions.Prometheus.Enabled = true + dk.Spec.Extensions.Enabled = true mod := NewEecVolumeModifier(dk) assert.True(t, mod.Enabled()) }) - t.Run("Prometheus extension is disabled", func(t *testing.T) { + t.Run("Extension are disabled", func(t *testing.T) { dk := getBaseDynakube() - dk.Spec.Extensions.Prometheus.Enabled = false + dk.Spec.Extensions.Enabled = false mod := NewEecVolumeModifier(dk) @@ -30,7 +30,7 @@ func TestEecEnabled(t *testing.T) { func TestEecModify(t *testing.T) { t.Run("Statefulset is successfully modified with eec volume", func(t *testing.T) { dk := getBaseDynakube() - dk.Spec.Extensions.Prometheus.Enabled = true + dk.Spec.Extensions.Enabled = true mod := NewEecVolumeModifier(dk) builder := createBuilderForTesting() diff --git a/pkg/controllers/dynakube/activegate/reconciler_test.go b/pkg/controllers/dynakube/activegate/reconciler_test.go index 5a1de190fd..2fa050f8ca 100644 --- a/pkg/controllers/dynakube/activegate/reconciler_test.go +++ b/pkg/controllers/dynakube/activegate/reconciler_test.go @@ -242,9 +242,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { Spec: dynakube.DynaKubeSpec{ ActiveGate: dynakube.ActiveGateSpec{Capabilities: []dynakube.CapabilityDisplayName{}}, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: false, - }, + Enabled: false, }, }, } @@ -275,9 +273,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { }, Spec: dynakube.DynaKubeSpec{ Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -310,9 +306,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { Spec: dynakube.DynaKubeSpec{ ActiveGate: dynakube.ActiveGateSpec{Capabilities: []dynakube.CapabilityDisplayName{}}, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -345,9 +339,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { Spec: dynakube.DynaKubeSpec{ ActiveGate: dynakube.ActiveGateSpec{Capabilities: []dynakube.CapabilityDisplayName{dynakube.KubeMonCapability.DisplayName}}, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -380,9 +372,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { Spec: dynakube.DynaKubeSpec{ ActiveGate: dynakube.ActiveGateSpec{Capabilities: []dynakube.CapabilityDisplayName{dynakube.KubeMonCapability.DisplayName}}, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -423,7 +413,7 @@ func TestExtensionControllerRequiresActiveGate(t *testing.T) { require.NoError(t, err) // disable extensions - r.dk.Spec.Extensions.Prometheus.Enabled = false + r.dk.Spec.Extensions.Enabled = false r.connectionReconciler = createGenericReconcilerMock(t) r.versionReconciler = createVersionReconcilerMock(t) r.pullSecretReconciler = createGenericReconcilerMock(t) diff --git a/pkg/controllers/dynakube/extension/eec/reconciler.go b/pkg/controllers/dynakube/extension/eec/reconciler.go index e8a787a8e8..df2daa582b 100644 --- a/pkg/controllers/dynakube/extension/eec/reconciler.go +++ b/pkg/controllers/dynakube/extension/eec/reconciler.go @@ -32,7 +32,7 @@ func NewReconciler(clt client.Client, apiReader client.Reader, dk *dynakube.Dyna } func (r *reconciler) Reconcile(ctx context.Context) error { - if !r.dk.PrometheusEnabled() { + if !r.dk.IsExtensionsEnabled() { if meta.FindStatusCondition(*r.dk.Conditions(), extensionsControllerStatefulSetConditionType) == nil { return nil } diff --git a/pkg/controllers/dynakube/extension/eec/reconciler_test.go b/pkg/controllers/dynakube/extension/eec/reconciler_test.go index d1d81dd3cf..d58cbd9b66 100644 --- a/pkg/controllers/dynakube/extension/eec/reconciler_test.go +++ b/pkg/controllers/dynakube/extension/eec/reconciler_test.go @@ -43,9 +43,7 @@ func getTestDynakube() *dynakube.DynaKube { }, Spec: dynakube.DynaKubeSpec{ Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, Templates: dynakube.TemplatesSpec{ ExtensionExecutionController: dynakube.ExtensionExecutionControllerSpec{ @@ -117,9 +115,9 @@ func TestConditions(t *testing.T) { assert.True(t, errors.IsNotFound(err)) }) - t.Run("prometheus is disabled", func(t *testing.T) { + t.Run("extensions are disabled", func(t *testing.T) { dk := getTestDynakube() - dk.Spec.Extensions.Prometheus.Enabled = false + dk.Spec.Extensions.Enabled = false conditions.SetStatefulSetCreated(dk.Conditions(), extensionsControllerStatefulSetConditionType, dynakube.ExtensionsExecutionControllerStatefulsetName) mockK8sClient := fake.NewClient(dk) diff --git a/pkg/controllers/dynakube/extension/otel/reconciler.go b/pkg/controllers/dynakube/extension/otel/reconciler.go index f4e2c98044..56389c7dc3 100644 --- a/pkg/controllers/dynakube/extension/otel/reconciler.go +++ b/pkg/controllers/dynakube/extension/otel/reconciler.go @@ -31,7 +31,7 @@ func NewReconciler(clt client.Client, apiReader client.Reader, dk *dynakube.Dyna } func (r *reconciler) Reconcile(ctx context.Context) error { - if !r.dk.PrometheusEnabled() { + if !r.dk.IsExtensionsEnabled() { if meta.FindStatusCondition(*r.dk.Conditions(), otelControllerStatefulSetConditionType) == nil { return nil } diff --git a/pkg/controllers/dynakube/extension/otel/statefulset_test.go b/pkg/controllers/dynakube/extension/otel/statefulset_test.go index 9d6ef28201..b1ef393d72 100644 --- a/pkg/controllers/dynakube/extension/otel/statefulset_test.go +++ b/pkg/controllers/dynakube/extension/otel/statefulset_test.go @@ -38,9 +38,7 @@ func getTestDynakube() *dynakube.DynaKube { }, Spec: dynakube.DynaKubeSpec{ Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, Templates: dynakube.TemplatesSpec{OpenTelemetryCollector: dynakube.OpenTelemetryCollectorSpec{}}, }, @@ -61,9 +59,9 @@ func getStatefulset(t *testing.T, dk *dynakube.DynaKube) *appsv1.StatefulSet { } func TestConditions(t *testing.T) { - t.Run("prometheus is disabled", func(t *testing.T) { + t.Run("extensions are disabled", func(t *testing.T) { dk := getTestDynakube() - dk.Spec.Extensions.Prometheus.Enabled = false + dk.Spec.Extensions.Enabled = false conditions.SetStatefulSetCreated(dk.Conditions(), otelControllerStatefulSetConditionType, dynakube.ExtensionsCollectorStatefulsetName) mockK8sClient := fake.NewClient(dk) diff --git a/pkg/controllers/dynakube/extension/reconciler_test.go b/pkg/controllers/dynakube/extension/reconciler_test.go index 682e793aa7..4003754a7a 100644 --- a/pkg/controllers/dynakube/extension/reconciler_test.go +++ b/pkg/controllers/dynakube/extension/reconciler_test.go @@ -82,7 +82,7 @@ func TestReconciler_Reconcile(t *testing.T) { }) t.Run("Extension secret is generated when Prometheus is enabled", func(t *testing.T) { dk := createDynakube() - dk.Spec.Extensions.Prometheus.Enabled = true + dk.Spec.Extensions.Enabled = true fakeClient := fake.NewClient() r := NewReconciler(fakeClient, fakeClient, dk) @@ -106,7 +106,7 @@ func TestReconciler_Reconcile(t *testing.T) { }) t.Run(`Extension SecretCreated failure condition is set when error`, func(t *testing.T) { dk := createDynakube() - dk.Spec.Extensions.Prometheus.Enabled = true + dk.Spec.Extensions.Enabled = true misconfiguredReader, _ := client.New(&rest.Config{}, client.Options{}) r := NewReconciler(fake.NewClient(), misconfiguredReader, dk) @@ -122,9 +122,9 @@ func TestReconciler_Reconcile(t *testing.T) { assert.Contains(t, condition.Message, "A problem occurred when using the Kubernetes API") }) - t.Run("Create service when prometheus is enabled with minimal setup", func(t *testing.T) { + t.Run("Create service when extensions are enabled with minimal setup", func(t *testing.T) { dk := createDynakube() - dk.Spec.Extensions.Prometheus.Enabled = true + dk.Spec.Extensions.Enabled = true mockK8sClient := fake.NewClient(dk) @@ -147,9 +147,9 @@ func TestReconciler_Reconcile(t *testing.T) { assert.Equal(t, dk.Name+consts.ExtensionsControllerSuffix+" created", condition.Message) }) - t.Run("Don't create service when prometheus is disabled with minimal setup", func(t *testing.T) { + t.Run("Don't create service when extensions are disabled with minimal setup", func(t *testing.T) { dk := createDynakube() - dk.Spec.Extensions.Prometheus.Enabled = false + dk.Spec.Extensions.Enabled = false mockK8sClient := fake.NewClient(dk) diff --git a/pkg/controllers/dynakube/extension/secret.go b/pkg/controllers/dynakube/extension/secret.go index 5da8d32553..5b9e9c1b8a 100644 --- a/pkg/controllers/dynakube/extension/secret.go +++ b/pkg/controllers/dynakube/extension/secret.go @@ -15,7 +15,7 @@ import ( ) func (r *reconciler) reconcileSecret(ctx context.Context) error { - if !r.dk.PrometheusEnabled() { + if !r.dk.IsExtensionsEnabled() { if meta.FindStatusCondition(*r.dk.Conditions(), consts.ExtensionsSecretConditionType) == nil { return nil } diff --git a/pkg/controllers/dynakube/extension/service.go b/pkg/controllers/dynakube/extension/service.go index 3e089f28de..b7bee955a5 100644 --- a/pkg/controllers/dynakube/extension/service.go +++ b/pkg/controllers/dynakube/extension/service.go @@ -14,7 +14,7 @@ import ( ) func (r *reconciler) reconcileService(ctx context.Context) error { - if !r.dk.PrometheusEnabled() { + if !r.dk.IsExtensionsEnabled() { if meta.FindStatusCondition(*r.dk.Conditions(), consts.ExtensionsServiceConditionType) == nil { return nil } diff --git a/pkg/controllers/dynakube/phase.go b/pkg/controllers/dynakube/phase.go index 541e687234..60589a2a54 100644 --- a/pkg/controllers/dynakube/phase.go +++ b/pkg/controllers/dynakube/phase.go @@ -61,7 +61,7 @@ func (controller *Controller) determineExtensionsCollectorPhase(dk *dynakube.Dyn } func (controller *Controller) determinePrometheusStatefulsetPhase(dk *dynakube.DynaKube, statefulsetName string) status.DeploymentPhase { - if dk.PrometheusEnabled() { + if dk.IsExtensionsEnabled() { statefulSet := &appsv1.StatefulSet{} err := controller.client.Get(context.Background(), types.NamespacedName{Name: statefulsetName, Namespace: dk.Namespace}, statefulSet) diff --git a/pkg/controllers/dynakube/phase_test.go b/pkg/controllers/dynakube/phase_test.go index 4e9ec72739..0c0e73b82e 100644 --- a/pkg/controllers/dynakube/phase_test.go +++ b/pkg/controllers/dynakube/phase_test.go @@ -163,9 +163,7 @@ func TestExtensionsExecutionControllerPhaseChanges(t *testing.T) { }, Spec: dynakube.DynaKubeSpec{ Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -218,9 +216,7 @@ func TestExtensionsCollectorPhaseChanges(t *testing.T) { }, Spec: dynakube.DynaKubeSpec{ Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, } @@ -277,9 +273,7 @@ func TestDynakubePhaseChanges(t *testing.T) { }, Extensions: dynakube.ExtensionsSpec{ - Prometheus: dynakube.PrometheusSpec{ - Enabled: true, - }, + Enabled: true, }, }, }