Removed prometheus. Updated comment.

Author: lamai93

pkg/apis/deployment/v1alpha/metrics_spec.go

@@ -24,7 +24,6 @@ package v1alpha
 import (
 	"github.com/arangodb/kube-arangodb/pkg/util"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
-	"github.com/pkg/errors"
 )
 
 // MetricsAuthenticationSpec contains spec for authentication with arangodb
@@ -33,44 +32,11 @@ type MetricsAuthenticationSpec struct {
 	JWTTokenSecretName *string `json:"jwtTokenSecretName,omitempty"`
 }
 
-// MetricsMonitorResourceMode specifies the type of ServiceMonitor resource to be installed
-type MetricsMonitorResourceMode string
-
-const (
-	// MetricsMonitorResourceModeAuto detects if the CRD for ServiceMonitor is available and creates the resource if so (default)
-	MetricsMonitorResourceModeAuto MetricsMonitorResourceMode = "Auto"
-	// MetricsMonitorResourceModeNone never creates the resource
-	MetricsMonitorResourceModeNone MetricsMonitorResourceMode = "None"
-	// MetricsMonitorResourceModeAlways always creates the resource and fails if the CRD is not available
-	MetricsMonitorResourceModeAlways MetricsMonitorResourceMode = "Always"
-)
-
-// IsAuto returns true if mode is MetricsMonitorResourceModeAuto
-func (t MetricsMonitorResourceMode) IsAuto() bool {
-	return t == MetricsMonitorResourceModeAuto
-}
-
-// IsNone returns true if mode is MetricsMonitorResourceModeNone
-func (t MetricsMonitorResourceMode) IsNone() bool {
-	return t == MetricsMonitorResourceModeNone
-}
-
-// IsAlways returns true if mode is MetricsMonitorResourceModeAlways
-func (t MetricsMonitorResourceMode) IsAlways() bool {
-	return t == MetricsMonitorResourceModeAlways
-}
-
-// MetricsPrometheusSpec contains metrics for prometheus
-type MetricsPrometheusSpec struct {
-	MonitorResource *MetricsMonitorResourceMode `json:"monitorResource,omitempty"`
-}
-
 // MetricsSpec contains spec for arangodb exporter
 type MetricsSpec struct {
 	Enabled        *bool                     `json:"enabled,omitempty"`
 	Image          *string                   `json:"image,omitempty"`
 	Authentication MetricsAuthenticationSpec `json:"authentication,omitempty"`
-	Prometheus     MetricsPrometheusSpec     `json:"prometheus,omitempty"`
 }
 
 // IsEnabled returns whether metrics are enabled or not
@@ -96,7 +62,6 @@ func (s *MetricsSpec) SetDefaults(defaultTokenName string, isAuthenticated bool)
 	if s.GetJWTTokenSecretName() == "" {
 		s.Authentication.JWTTokenSecretName = util.NewString(defaultTokenName)
 	}
-	s.Prometheus.SetDefaults()
 }
 
 // GetJWTTokenSecretName returns the token secret name or empty string
@@ -120,7 +85,6 @@ func (s *MetricsSpec) SetDefaultsFrom(source MetricsSpec) {
 	if s.Authentication.JWTTokenSecretName == nil {
 		s.Authentication.JWTTokenSecretName = util.NewStringOrNil(source.Authentication.JWTTokenSecretName)
 	}
-	s.Prometheus.SetDefaultsFrom(source.Prometheus)
 }
 
 // Validate the given spec
@@ -132,73 +96,10 @@ func (s *MetricsSpec) Validate() error {
 		}
 	}
 
-	if err := s.Prometheus.Validate(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
 // ResetImmutableFields replaces all immutable fields in the given target with values from the source spec.
 func (s MetricsSpec) ResetImmutableFields(fieldPrefix string, target *MetricsSpec) []string {
 	return nil
 }
-
-// SetDefaults sets default values
-func (p *MetricsPrometheusSpec) SetDefaults() {
-}
-
-// SetDefaultsFrom fills unspecified fields with a value from given source spec.
-func (p *MetricsPrometheusSpec) SetDefaultsFrom(source MetricsPrometheusSpec) {
-	if p.MonitorResource == nil {
-		p.MonitorResource = NewMetricsMonitorResourceModeOrNil(source.MonitorResource)
-	}
-}
-
-// Validate the given spec
-func (p *MetricsPrometheusSpec) Validate() error {
-	if p.MonitorResource != nil {
-		return p.MonitorResource.Validate()
-	}
-	return nil
-}
-
-// Validate the given spec
-func (t MetricsMonitorResourceMode) Validate() error {
-	switch t {
-	case MetricsMonitorResourceModeAuto, MetricsMonitorResourceModeNone, MetricsMonitorResourceModeAlways:
-		return nil
-	default:
-		return maskAny(errors.Wrapf(ValidationError, "Unknown monitor resource mode: '%s'", string(t)))
-	}
-}
-
-// NewMetricsMonitorResourceMode returns a reference to a string with given value.
-func NewMetricsMonitorResourceMode(input MetricsMonitorResourceMode) *MetricsMonitorResourceMode {
-	return &input
-}
-
-// NewMetricsMonitorResourceModeOrNil returns nil if input is nil, otherwise returns a clone of the given value.
-func NewMetricsMonitorResourceModeOrNil(input *MetricsMonitorResourceMode) *MetricsMonitorResourceMode {
-	if input == nil {
-		return nil
-	}
-
-	return NewMetricsMonitorResourceMode(*input)
-}
-
-// MetricsMonitorResourceModeOrDefault returns the default value (or empty string) if input is nil, otherwise returns the referenced value.
-func MetricsMonitorResourceModeOrDefault(input *MetricsMonitorResourceMode, defaultValue ...MetricsMonitorResourceMode) MetricsMonitorResourceMode {
-	if input == nil {
-		if len(defaultValue) > 0 {
-			return defaultValue[0]
-		}
-		return ""
-	}
-	return *input
-}
-
-// GetMode returns the given mode or the default value if it is nil
-func (t *MetricsMonitorResourceMode) GetMode() MetricsMonitorResourceMode {
-	return MetricsMonitorResourceModeOrDefault(t, MetricsMonitorResourceModeAuto)
-}

pkg/apis/deployment/v1alpha/zz_generated.deepcopy.go

@@ -94,8 +94,8 @@ func IsPodReady(pod *v1.Pod) bool {
 	return condition != nil && condition.Status == v1.ConditionTrue
 }
 
-// IsPodSucceeded returns true if all containers of the pod
-// have terminated with exit code 0.
+// IsPodSucceeded returns true if the arangodb container of the pod
+// has terminated with exit code 0.
 func IsPodSucceeded(pod *v1.Pod) bool {
 	if pod.Status.Phase == v1.PodSucceeded {
 		return true
@@ -114,8 +114,8 @@ func IsPodSucceeded(pod *v1.Pod) bool {
 	}
 }
 
-// IsPodFailed returns true if all containers of the pod
-// have terminated and at least one of them wih a non-zero exit code.
+// IsPodFailed returns true if the arangodb container of the pod
+// has terminated wih a non-zero exit code.
 func IsPodFailed(pod *v1.Pod) bool {
 	if pod.Status.Phase == v1.PodFailed {
 		return true