Reflect changes to observatorium operator

observatorium · Apr 7, 2020 · 79a4c0c · 79a4c0c
1 parent 1e93dc1
commit 79a4c0c
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 6 deletions.
diff --git a/api/v1alpha1/observatorium_types.go b/api/v1alpha1/observatorium_types.go
@@ -40,6 +40,8 @@ type ObservatoriumSpec struct {
 	QueryCache QueryCacheSpec `json:"queryCache"`
 	// Thanos StoreSpec
 	Store StoreSpec `json:"store"`
+	// Thanos StoreCache
+	StoreCache StoreCacheSpec `json:"storeCache"`
 	// Thanos RulerSpec
 	Rule RuleSpec `json:"rule"`
 	// API Gateway
@@ -71,6 +73,17 @@ type StoreSpec struct {
 	Shards              *int32              `json:"shards,omitempty"`
 }
 
+type StoreCacheSpec struct {
+	// Memcached image
+	Image string `json:"image"`
+	// Version of Memcached image to be deployed.
+	Version string `json:"version,omitempty"`
+	// Number of Memcached replicas.
+	Replicas *int32 `json:"replicas,omitempty"`
+	// Memory limit of Memcached in megabytes.
+	MemoryLimitMB *int32 `json:"memory_limit_mb,omitempty"`
+}
+
 type APIGatewaySpec struct {
 	// API Gateway image
 	Image string `json:"image"`
@@ -103,7 +116,7 @@ type QueryCacheSpec struct {
 	Image string `json:"image"`
 	// Number of Query Cache replicas.
 	Replicas *int32 `json:"replicas,omitempty"`
-	// Version of  Query Cache image to be deployed.
+	// Version of Query Cache image to be deployed.
 	Version string `json:"version,omitempty"`
 }
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/deploy/crds/core.observatorium.io_observatoria.yaml b/deploy/crds/core.observatorium.io_observatoria.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.2.8
   creationTimestamp: null
   name: observatoria.core.observatorium.io
 spec:
@@ -239,7 +239,7 @@ spec:
                   format: int32
                   type: integer
                 version:
-                  description: Version of  Query Cache image to be deployed.
+                  description: Version of Query Cache image to be deployed.
                   type: string
               required:
               - image
@@ -664,6 +664,26 @@ spec:
               required:
               - volumeClaimTemplate
               type: object
+            storeCache:
+              description: Thanos StoreCache
+              properties:
+                image:
+                  description: Memcached image
+                  type: string
+                memory_limit_mb:
+                  description: Memory limit of Memcached in megabytes.
+                  format: int32
+                  type: integer
+                replicas:
+                  description: Number of Memcached replicas.
+                  format: int32
+                  type: integer
+                version:
+                  description: Version of Memcached image to be deployed.
+                  type: string
+              required:
+              - image
+              type: object
             thanosImage:
               description: Thanos Image name
               type: string
@@ -692,6 +712,7 @@ spec:
           - receivers
           - rule
           - store
+          - storeCache
           - thanosImage
           - thanosReceiveController
           - thanosVersion

diff --git a/environments/base/default-config.libsonnet b/environments/base/default-config.libsonnet
@@ -104,6 +104,7 @@
     image: 'docker.io/memcached:' + scConfig.version,
     exporterVersion: 'v0.6.0',
     exporterImage: 'prom/memcached-exporter:' + scConfig.exporterVersion,
+    memoryLimitMb: 1024,
   },
 
   query: {

diff --git a/environments/openshift/manifests/observatorium-template.yaml b/environments/openshift/manifests/observatorium-template.yaml
@@ -2872,12 +2872,14 @@ parameters:
   value: 500m
 - name: THANOS_STORE_MEMCACHED_CPU_LIMIT
   value: "3"
+- name: THANOS_STORE_MEMCACHED_REPLICAS
+  value: "1"
 - name: THANOS_STORE_MEMCACHED_MEMORY_LIMIT_MB
   value: "1024"
 - name: THANOS_STORE_MEMCACHED_MEMORY_REQUEST
   value: 1329Mi
 - name: THANOS_STORE_MEMCACHED_MEMORY_LIMIT
-  value: 1844Mi
+  value: 1536Mi
 - name: THANOS_STORE_MEMCACHED_EXPORTER_CPU_REQUEST
   value: 50m
 - name: THANOS_STORE_MEMCACHED_EXPORTER_CPU_LIMIT

diff --git a/environments/openshift/obs.jsonnet b/environments/openshift/obs.jsonnet
@@ -819,6 +819,10 @@ local up = (import '../../components/up.libsonnet');
         name: 'THANOS_STORE_MEMCACHED_CPU_LIMIT',
         value: '3',
       },
+      {
+        name: 'THANOS_STORE_MEMCACHED_REPLICAS',
+        value: '1',
+      },
       {
         name: 'THANOS_STORE_MEMCACHED_MEMORY_LIMIT_MB',
         value: '1024',

diff --git a/environments/operator/operator-config.libsonnet b/environments/operator/operator-config.libsonnet
@@ -31,14 +31,22 @@ cr.spec {
     version: thanosVersion,
     objectStorageConfig: objectStorageConfig,
   },
-  query: {
+  storeCache+:: {
+    image: cr.spec.storeCache.image,
+    version: cr.spec.storeCache.version,
+    replicas: cr.spec.storeCache.replicas,
+    memoryLimitMb: cr.spec.storeCache.memoryLimitMb,
+    exporterVersion: 'v0.6.0',
+    exporterImage: 'prom/memcached-exporter:' + scConfig.exporterVersion,
+  },
+  query+:: {
     image: thanosImage,
     version: thanosVersion,
   },
   queryCache+:: {
     image: cr.spec.queryCache.image,
   },
-  apiGatewayQuery: {
+  apiGatewayQuery+:: {
     image: thanosImage,
     version: thanosVersion,
   },

diff --git a/example/main.jsonnet b/example/main.jsonnet
@@ -26,6 +26,12 @@ local obs = (import '../environments/base/observatorium.jsonnet');
       volumeClaimTemplate: obs.config.store.volumeClaimTemplate,
       shards: obs.config.store.shards,
     },
+    storeCache: {
+      image: obs.config.storeCache.image,
+      version: obs.config.storeCache.version,
+      replicas: obs.config.storeCache.replicas,
+      memoryLimitMb: obs.config.storeCache.memoryLimitMb,
+    },
     compact: {
       volumeClaimTemplate: obs.config.compact.volumeClaimTemplate,
       retentionResolutionRaw: obs.config.compact.retentionResolutionRaw,

diff --git a/example/manifests/observatorium.yaml b/example/manifests/observatorium.yaml
@@ -56,6 +56,11 @@ spec:
         resources:
           requests:
             storage: 50Gi
+  storeCache:
+    image: docker.io/memcached:1.6.3-alpine
+    memoryLimitMb: 1024
+    replicas: 1
+    version: 1.6.3-alpine
   thanosImage: quay.io/thanos/thanos:v0.12.0-rc.0
   thanosReceiveController:
     image: quay.io/observatorium/thanos-receive-controller:master-2020-02-06-b66e0c8