Rename HTTPService to ServiceTemplate

operators/pkg/apis/common/v1alpha1/common.go

@@ -37,7 +37,7 @@ func (s ObjectSelector) NamespacedName() types.NamespacedName {
 // HTTPConfig configures a HTTP-based service.
 type HTTPConfig struct {
 	// Service is a template for the Kubernetes Service
-	Service HTTPService `json:"service,omitempty"`
+	Service ServiceTemplate `json:"service,omitempty"`
 	// TLS describe additional options to consider when generating HTTP TLS certificates.
 	TLS TLSOptions `json:"tls,omitempty"`
 }
@@ -59,8 +59,8 @@ type SubjectAlternativeName struct {
 	IP  string `json:"ip,omitempty"`
 }
 
-// HTTPService contains defaults for a HTTP service.
-type HTTPService struct {
+// ServiceTemplate describes the data a service should have when created from a template
+type ServiceTemplate struct {
 	// ObjectMeta is metadata for the service.
 	// The name and namespace provided here is managed by ECK and will be ignored.
 	// +optional
@@ -70,21 +70,3 @@ type HTTPService struct {
 	// +optional
 	Spec v1.ServiceSpec `json:"spec,omitempty"`
 }
-
-// HTTPServiceObjectMeta is metadata for HTTP Service.
-type HTTPServiceObjectMeta struct {
-	// Annotations is an unstructured key value map stored with a resource that may be
-	// set by external tools to store and retrieve arbitrary metadata. They are not
-	// queryable and should be preserved when modifying objects.
-	// More info: http://kubernetes.io/docs/user-guide/annotations
-	// +optional
-	Annotations map[string]string `json:"annotations,omitempty"`
-}
-
-// HTTPServiceSpec contains a subset of overridable settings for the HTTP Service
-type HTTPServiceSpec struct {
-	// Type determines which service type to use for this workload. The
-	// options are: `ClusterIP|LoadBalancer|NodePort`. Defaults to ClusterIP.
-	// +kubebuilder:validation:Enum=ClusterIP,LoadBalancer,NodePort
-	Type string `json:"type,omitempty"`
-}