Skip to content

Commit

Permalink
Merge pull request #177 from paramite/no-prom-by-default
Browse files Browse the repository at this point in the history
Avoid installing Prometheus by default
  • Loading branch information
openshift-merge-robot authored Sep 13, 2023
2 parents 1c3d089 + 70cb56a commit b908779
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion api/bases/telemetry.openstack.org_autoscalings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion api/bases/telemetry.openstack.org_telemetries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions api/v1beta1/autoscaling_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -84,7 +84,6 @@ func (instance Autoscaling) IsReady() bool {
return instance.Status.Conditions.IsTrue(condition.ReadyCondition)
}


func init() {
SchemeBuilder.Register(&Autoscaling{}, &AutoscalingList{})
}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/telemetry.openstack.org_autoscalings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/telemetry.openstack.org_telemetries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit b908779

Please sign in to comment.