Merge pull request #11 from vyzigold/add-LokiStackSize

Add lokiStackSize field to CK CRD

Author: jlarriba

api/bases/telemetry.openstack.org_cloudkitties.yaml

@@ -507,6 +507,17 @@ spec:
                   Right now required by the maridb-operator to get the credentials from the instance to create the DB
                   Might not be required in future
                 type: string
+              lokiStackSize:
+                default: 1x.demo
+                description: Size of the LokiStack. Supported are "1x.demo" (default),
+                  "1x.pico", "1x.extra-small", "1x.small", "1x.medium"
+                enum:
+                - 1x.demo
+                - 1x.pico
+                - 1x.extra-small
+                - 1x.small
+                - 1x.medium
+                type: string
               memcachedInstance:
                 default: memcached
                 description: Memcached instance name.

api/bases/telemetry.openstack.org_telemetries.yaml

@@ -1072,6 +1072,17 @@ spec:
                     description: Enabled - Whether OpenStack CloudKitty service should
                       be deployed and managed
                     type: boolean
+                  lokiStackSize:
+                    default: 1x.demo
+                    description: Size of the LokiStack. Supported are "1x.demo" (default),
+                      "1x.pico", "1x.extra-small", "1x.small", "1x.medium"
+                    enum:
+                    - 1x.demo
+                    - 1x.pico
+                    - 1x.extra-small
+                    - 1x.small
+                    - 1x.medium
+                    type: string
                   memcachedInstance:
                     default: memcached
                     description: Memcached instance name.

api/v1beta1/cloudkitty_types.go

@@ -199,6 +199,12 @@ type CloudKittySpecBase struct {
 	// Storage class used for Loki
 	// +kubebuilder:validation:Optional
 	StorageClass string `json:"storageClass,omitempty"`
+
+	// Size of the LokiStack. Supported are "1x.demo" (default), "1x.pico", "1x.extra-small", "1x.small", "1x.medium"
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Enum="1x.demo";"1x.pico";"1x.extra-small";"1x.small";"1x.medium"
+	// +kubebuilder:default="1x.demo"
+	LokiStackSize string `json:"lokiStackSize"`
 }
 
 // CloudKittySpecCore the same as CloudKittySpec without ContainerImage references

config/crd/bases/telemetry.openstack.org_cloudkitties.yaml

@@ -507,6 +507,17 @@ spec:
                   Right now required by the maridb-operator to get the credentials from the instance to create the DB
                   Might not be required in future
                 type: string
+              lokiStackSize:
+                default: 1x.demo
+                description: Size of the LokiStack. Supported are "1x.demo" (default),
+                  "1x.pico", "1x.extra-small", "1x.small", "1x.medium"
+                enum:
+                - 1x.demo
+                - 1x.pico
+                - 1x.extra-small
+                - 1x.small
+                - 1x.medium
+                type: string
               memcachedInstance:
                 default: memcached
                 description: Memcached instance name.

config/crd/bases/telemetry.openstack.org_telemetries.yaml

@@ -1072,6 +1072,17 @@ spec:
                     description: Enabled - Whether OpenStack CloudKitty service should
                       be deployed and managed
                     type: boolean
+                  lokiStackSize:
+                    default: 1x.demo
+                    description: Size of the LokiStack. Supported are "1x.demo" (default),
+                      "1x.pico", "1x.extra-small", "1x.small", "1x.medium"
+                    enum:
+                    - 1x.demo
+                    - 1x.pico
+                    - 1x.extra-small
+                    - 1x.small
+                    - 1x.medium
+                    type: string
                   memcachedInstance:
                     default: memcached
                     description: Memcached instance name.

pkg/cloudkitty/lokistack.go

@@ -119,6 +119,10 @@ func LokiStack(
 	if err != nil {
 		return nil, err
 	}
+	size := "1x.demo"
+	if instance.Spec.LokiStackSize != "" {
+		size = instance.Spec.LokiStackSize
+	}
 	lokiStack := &lokistackv1.LokiStack{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-lokistack", instance.Name),
@@ -128,7 +132,7 @@ func LokiStack(
 		Spec: lokistackv1.LokiStackSpec{
 			// TODO: What size do we even want? I assume something
 			//       smallish since only rating interact with this
-			Size:             lokistackv1.LokiStackSizeType("1x.demo"),
+			Size:             lokistackv1.LokiStackSizeType(size),
 			Storage:          getLokiStackObjectStorageSpec(instance.Spec.S3StorageConfig),
 			StorageClassName: instance.Spec.StorageClass,
 			Tenants: &lokistackv1.TenantsSpec{