From 70cb56a3961a7e8c3354e0442430b0a9bc0f4c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=A1gr?= Date: Tue, 12 Sep 2023 13:23:39 +0200 Subject: [PATCH] Avoid installing Prometheus by default --- api/bases/telemetry.openstack.org_autoscalings.yaml | 2 +- api/bases/telemetry.openstack.org_telemetries.yaml | 2 +- api/v1beta1/autoscaling_types.go | 5 ++--- config/crd/bases/telemetry.openstack.org_autoscalings.yaml | 2 +- config/crd/bases/telemetry.openstack.org_telemetries.yaml | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/bases/telemetry.openstack.org_autoscalings.yaml b/api/bases/telemetry.openstack.org_autoscalings.yaml index 2e09f608..c29786db 100644 --- a/api/bases/telemetry.openstack.org_autoscalings.yaml +++ b/api/bases/telemetry.openstack.org_autoscalings.yaml @@ -43,7 +43,7 @@ spec: description: Specification of which prometheus to use for autoscaling properties: deployPrometheus: - default: true + default: false description: Enables the deployment of autoscaling prometheus type: boolean host: diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml index cf371547..4f20e788 100644 --- a/api/bases/telemetry.openstack.org_telemetries.yaml +++ b/api/bases/telemetry.openstack.org_telemetries.yaml @@ -47,7 +47,7 @@ spec: description: Specification of which prometheus to use for autoscaling properties: deployPrometheus: - default: true + default: false description: Enables the deployment of autoscaling prometheus type: boolean host: diff --git a/api/v1beta1/autoscaling_types.go b/api/v1beta1/autoscaling_types.go index f7ad2337..be7603fc 100644 --- a/api/v1beta1/autoscaling_types.go +++ b/api/v1beta1/autoscaling_types.go @@ -17,14 +17,14 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // Prometheus defines which prometheus to use for Autoscaling type Prometheus struct { // Enables the deployment of autoscaling prometheus - // +kubebuilder:default=true + // +kubebuilder:default=false DeployPrometheus bool `json:"deployPrometheus,omitempty"` // Host of user deployed prometheus if deployPrometheus is set to false @@ -84,7 +84,6 @@ func (instance Autoscaling) IsReady() bool { return instance.Status.Conditions.IsTrue(condition.ReadyCondition) } - func init() { SchemeBuilder.Register(&Autoscaling{}, &AutoscalingList{}) } diff --git a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml index 2e09f608..c29786db 100644 --- a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml +++ b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml @@ -43,7 +43,7 @@ spec: description: Specification of which prometheus to use for autoscaling properties: deployPrometheus: - default: true + default: false description: Enables the deployment of autoscaling prometheus type: boolean host: diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml index cf371547..4f20e788 100644 --- a/config/crd/bases/telemetry.openstack.org_telemetries.yaml +++ b/config/crd/bases/telemetry.openstack.org_telemetries.yaml @@ -47,7 +47,7 @@ spec: description: Specification of which prometheus to use for autoscaling properties: deployPrometheus: - default: true + default: false description: Enables the deployment of autoscaling prometheus type: boolean host: