first validation controller

api/v1alpha1/rpaasinstance.go

@@ -10,12 +10,13 @@ import (
 )
 
 const (
-	DefaultLabelKeyPrefix             = "rpaas.extensions.tsuru.io"
-	RpaasOperatorInstanceNameLabelKey = DefaultLabelKeyPrefix + "/instance-name"
-	RpaasOperatorServiceNameLabelKey  = DefaultLabelKeyPrefix + "/service-name"
-	RpaasOperatorPlanNameLabelKey     = DefaultLabelKeyPrefix + "/plan-name"
-	RpaasOperatorTeamOwnerLabelKey    = DefaultLabelKeyPrefix + "/team-owner"
-	RpaasOperatorClusterNameLabelKey  = DefaultLabelKeyPrefix + "/cluster-name"
+	DefaultLabelKeyPrefix               = "rpaas.extensions.tsuru.io"
+	RpaasOperatorValidationNameLabelKey = DefaultLabelKeyPrefix + "/validation-name"
+	RpaasOperatorInstanceNameLabelKey   = DefaultLabelKeyPrefix + "/instance-name"
+	RpaasOperatorServiceNameLabelKey    = DefaultLabelKeyPrefix + "/service-name"
+	RpaasOperatorPlanNameLabelKey       = DefaultLabelKeyPrefix + "/plan-name"
+	RpaasOperatorTeamOwnerLabelKey      = DefaultLabelKeyPrefix + "/team-owner"
+	RpaasOperatorClusterNameLabelKey    = DefaultLabelKeyPrefix + "/cluster-name"
 
 	LegacyRpaasOperatorInstanceNameLabelKey = "rpaas_instance"
 	LegacyRpaasOperatorServiceNameLabelKey  = "rpaas_service"

api/v1alpha1/rpaasvalidation_types.go

@@ -5,7 +5,6 @@
 package v1alpha1
 
 import (
-	nginxv1alpha1 "github.com/tsuru/nginx-operator/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -18,49 +17,8 @@ type RpaasValidation struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Status RpaasValidationStatus `json:"status,omitempty"`
-	Spec   RpaasValidationSpec   `json:"spec,omitempty"`
-}
-
-// RpaasValidationSpec defines the desired state of RpaasInstance
-type RpaasValidationSpec struct {
-	// Flavors are references to RpaasFlavors resources. When provided, each flavor
-	// merges its instance template spec with this instance spec.
-	// +optional
-	Flavors []string `json:"flavors,omitempty"`
-
-	// PlanTemplate allow overriding fields in the specified plan.
-	// +optional
-	PlanTemplate *RpaasPlanSpec `json:"planTemplate,omitempty"`
-
-	// Binds is the list of apps bounded to the instance
-	// +optional
-	Binds []Bind `json:"binds,omitempty"`
-
-	// Blocks are configuration file fragments added to the generated nginx
-	// config.
-	Blocks map[BlockType]Value `json:"blocks,omitempty"`
-
-	// Locations hold paths that can be configured to forward resquests to
-	// one destination app or include raw NGINX configurations itself.
-	// +optional
-	Locations []Location `json:"locations,omitempty"`
-
-	// TLS configuration.
-	// +optional
-	TLS []nginxv1alpha1.NginxTLS `json:"tls,omitempty"`
-
-	// Files is a list of regular files of general purpose to be mounted on
-	// Nginx pods. As ConfigMap stores the file content, a file cannot exceed 1MiB.
-	// +optional
-	Files []File `json:"files,omitempty"`
-
-	// PodTemplate used to configure the NGINX pod template.
-	// +optional
-	PodTemplate nginxv1alpha1.NginxPodTemplateSpec `json:"podTemplate,omitempty"`
-
-	// DynamicCertificates enables automatic issuing and renewal for TLS certificates.
-	// +optional
-	DynamicCertificates *DynamicCertificates `json:"dynamicCertificates,omitempty"`
+	// Spec reuse the same properties of RpaasInstance, just to avoid duplication of code
+	Spec RpaasInstanceSpec `json:"spec,omitempty"`
 }
 
 // RpaasValidationStatus defines the observed state of RpaasValidation
@@ -72,10 +30,10 @@ type RpaasValidationStatus struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
 	// Valid determines whether validation is valid
-	Valid bool `json:"valid"`
+	Valid *bool `json:"valid,omitempty"`
 
 	// Feedback of validation of nginx
-	Error string `json:"error"`
+	Error string `json:"error,omitempty"`
 }
 
 // +kubebuilder:object:root=true