Autoscaling Elasticsearch: Introduce a dedicated custom resource

Makefile

@@ -97,7 +97,7 @@ go-generate:
 generate-crds-v1: go-generate controller-gen
 	# Generate webhook manifest
 	# Webhook definitions exist in both pkg/apis and pkg/controller/elasticsearch/validation
-	$(CONTROLLER_GEN) webhook object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... paths=./pkg/controller/elasticsearch/validation/...
+	$(CONTROLLER_GEN) webhook object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... paths=./pkg/controller/elasticsearch/validation/... paths=./pkg/controller/autoscaling/elasticsearch/validation/...
 	# Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) crd:crdVersions=v1,generateEmbeddedObjectMeta=true paths="./pkg/apis/..." output:crd:artifacts:config=config/crds/v1/bases
 	# apply patches to work around some CRD generation issues, and merge them into a single file

cmd/manager/main.go

@@ -57,6 +57,7 @@ import (
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/association"
 	associationctl "github.com/elastic/cloud-on-k8s/v2/pkg/controller/association/controller"
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/autoscaling"
+	esavalidation "github.com/elastic/cloud-on-k8s/v2/pkg/controller/autoscaling/elasticsearch/validation"
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/beat"
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/certificates"
 	"github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/container"
@@ -935,8 +936,9 @@ func setupWebhook(
 		}
 	}
 
-	// esv1 validating webhook is wired up differently, in order to access the k8s client
+	// Elasticsearch and ElasticsearchAutoscaling validating webhooks are wired up differently, in order to access the k8s client
 	esvalidation.RegisterWebhook(mgr, params.ValidateStorageClass, exposedNodeLabels, checker, managedNamespaces)
+	esavalidation.RegisterWebhook(mgr, params.ValidateStorageClass, checker, managedNamespaces)
 
 	// wait for the secret to be populated in the local filesystem before returning
 	interval := time.Second * 1

config/crds/v1/bases/kustomization.yaml

@@ -1,6 +1,7 @@
 resources:
   - apm.k8s.elastic.co_apmservers.yaml
   - elasticsearch.k8s.elastic.co_elasticsearches.yaml
+  - autoscaling.k8s.elastic.co_elasticsearchautoscalers.yaml
   - kibana.k8s.elastic.co_kibanas.yaml
   - enterprisesearch.k8s.elastic.co_enterprisesearches.yaml
   - beat.k8s.elastic.co_beats.yaml

config/e2e/rbac.yaml

@@ -192,6 +192,19 @@ rules:
       - update
       - patch
       - delete
+  - apiGroups:
+      - autoscaling.k8s.elastic.co
+    resources:
+      - elasticsearchautoscalers
+      - elasticsearchautoscalers/status
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - kibana.k8s.elastic.co
     resources:

config/recipes/autoscaling/elasticsearch.yaml

@@ -1,46 +1,69 @@
+---
+apiVersion: autoscaling.k8s.elastic.co/v1alpha1
+kind: ElasticsearchAutoscaler
+metadata:
+  name: autoscaling-sample
+spec:
+  elasticsearchRef:
+    name: elasticsearch-sample
+  policies:
+    - name: di
+      roles: ["data", "ingest" , "transform"]
+      ## Autoscaling deciders (https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-deciders.html) come with
+      ## default settings. Uncomment the lines below to adjust the deciders settings.
+      #deciders:
+      ## 'proactive_storage' is only provided as an example, each role comes with specific individual autoscaling deciders.
+      #  proactive_storage:
+      #    forecast_window: 5m
+      resources:
+        nodeCount:
+          min: 3
+          max: 8
+        cpu:
+          min: 2
+          max: 8
+        memory:
+          min: 2Gi
+          max: 16Gi
+        storage:
+          min: 64Gi
+          max: 512Gi
+    - name: ml
+      roles:
+        - ml
+      resources:
+        nodeCount:
+          min: 1
+          max: 9
+        cpu:
+          min: 1
+          max: 4
+        memory:
+          min: 2Gi
+          max: 8Gi
+        storage:
+          min: 1Gi
+          max: 1Gi
+
 ---
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
-  name: autoscaling-sample
-  annotations:
-    elasticsearch.alpha.elastic.co/autoscaling-spec: |
-      {
-          "policies": [{
-              "name": "di",
-              "roles": ["data", "ingest" , "transform"],
-              "deciders": {
-                "proactive_storage": {
-                    "forecast_window": "5m"
-                }
-              },
-              "resources": {
-                  "nodeCount": { "min": 3, "max": 8 },
-                  "cpu": { "min": 2, "max": 8 },
-                  "memory": { "min": "2Gi", "max": "16Gi" },
-                  "storage": { "min": "64Gi", "max": "512Gi" }
-              }
-          },
-          {
-              "name": "ml",
-              "roles": ["ml"],
-              "deciders": {
-                  "ml": {
-                      "down_scale_delay": "10m"
-                  }
-              },
-              "resources": {
-                  "nodeCount": { "min": 1, "max": 9 },
-                  "cpu": { "min": 1, "max": 4 },
-                  "memory": { "min": "2Gi", "max": "8Gi" }
-              }
-          }]
-      }
+  name: elasticsearch-sample
 spec:
   version: 8.4.0
   nodeSets:
     - name: master
-      count: 1
+      count: 3
+      podTemplate:
+        spec:
+          containers:
+            - name: elasticsearch
+              # Specify both limits and requests to benefit from the desired nodes API / Elasticsearch resources aware management.
+              resources:
+                limits:
+                  memory: 4Gi
+                  cpu: 2
       config:
         node:
           roles: [ "master" ]

config/webhook/manifests.yaml

@@ -246,3 +246,25 @@ webhooks:
     resources:
     - elasticsearches
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /validate-autoscaling-k8s-elastic-co-v1alpha1-elasticsearchautoscaler
+  failurePolicy: Ignore
+  matchPolicy: Exact
+  name: elastic-esa-validation-v1alpha1.k8s.elastic.co
+  rules:
+  - apiGroups:
+    - autoscaling.k8s.elastic.co
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - elasticsearchautoscalers
+  sideEffects: None