From ba013478a7c1d2ac302bb56e4ff7a77e54f3bf92 Mon Sep 17 00:00:00 2001
From: liyang <ly18846162402@163.com>
Date: Wed, 11 Oct 2023 12:06:08 +0800
Subject: [PATCH] chore: update operator version, and support oss strorage, wal
 configure

---
 charts/greptimedb-operator/Chart.yaml         |  4 ++--
 .../crds/greptimedbcluster.yaml               | 19 +++++++++++++++++++
 charts/greptimedb-operator/values.yaml        | 10 +++++-----
 charts/greptimedb/Chart.yaml                  |  2 +-
 charts/greptimedb/templates/cluster.yaml      | 10 ++++++++++
 charts/greptimedb/values.yaml                 |  4 ++--
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/charts/greptimedb-operator/Chart.yaml b/charts/greptimedb-operator/Chart.yaml
index 6446de2..394b7d0 100644
--- a/charts/greptimedb-operator/Chart.yaml
+++ b/charts/greptimedb-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 kubeVersion: ">=1.18.0-0"
 description: The greptimedb-operator Helm chart for Kubernetes
 name: greptimedb-operator
-appVersion: 0.1.0-alpha.15
-version: 0.1.1-alpha.12
+appVersion: 0.1.0-alpha.16
+version: 0.1.1-alpha.13
 type: application
 home: https://github.com/GreptimeTeam/greptimedb-operator
 sources:
diff --git a/charts/greptimedb-operator/crds/greptimedbcluster.yaml b/charts/greptimedb-operator/crds/greptimedbcluster.yaml
index 06fc47b..71abb06 100644
--- a/charts/greptimedb-operator/crds/greptimedbcluster.yaml
+++ b/charts/greptimedb-operator/crds/greptimedbcluster.yaml
@@ -2710,6 +2710,8 @@ spec:
                       storageSize:
                         pattern: (^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$)
                         type: string
+                      walDir:
+                        type: string
                     type: object
                   template:
                     properties:
@@ -10714,11 +10716,28 @@ spec:
                 type: integer
               storage:
                 properties:
+                  cacheCapacity:
+                    type: string
+                  cachePath:
+                    type: string
                   local:
                     properties:
                       directory:
                         type: string
                     type: object
+                  oss:
+                    properties:
+                      bucket:
+                        type: string
+                      endpoint:
+                        type: string
+                      region:
+                        type: string
+                      root:
+                        type: string
+                      secretName:
+                        type: string
+                    type: object
                   s3:
                     properties:
                       bucket:
diff --git a/charts/greptimedb-operator/values.yaml b/charts/greptimedb-operator/values.yaml
index 5afed56..7e31ecd 100644
--- a/charts/greptimedb-operator/values.yaml
+++ b/charts/greptimedb-operator/values.yaml
@@ -7,7 +7,7 @@ image:
   # The image pull policy for the controller
   imagePullPolicy: IfNotPresent
   # The image tag
-  tag: 0.1.0-alpha.15
+  tag: 0.1.0-alpha.16
   # The image pull secrets.
   pullSecrets: []
 
@@ -26,11 +26,11 @@ replicas: 1
 # Default resources for greptimedb operator
 resources:
   limits:
-    cpu: 500m
-    memory: 128Mi
+    cpu: 200m
+    memory: 256Mi
   requests:
-    cpu: 250m
-    memory: 64Mi
+    cpu: 100m
+    memory: 128Mi
 
 rbac:
   # install Role Based Access Control
diff --git a/charts/greptimedb/Chart.yaml b/charts/greptimedb/Chart.yaml
index 9b8688c..e78651c 100644
--- a/charts/greptimedb/Chart.yaml
+++ b/charts/greptimedb/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: greptimedb
 description: A Helm chart for deploying GreptimeDB cluster in Kubernetes
 type: application
-version: 0.1.1-alpha.14
+version: 0.1.1-alpha.15
 appVersion: 0.3.2
diff --git a/charts/greptimedb/templates/cluster.yaml b/charts/greptimedb/templates/cluster.yaml
index aaaca93..626b2bc 100644
--- a/charts/greptimedb/templates/cluster.yaml
+++ b/charts/greptimedb/templates/cluster.yaml
@@ -46,6 +46,9 @@ spec:
       storageClassName: {{ .Values.datanode.storage.storageClassName }}
       storageSize: {{ .Values.datanode.storage.storageSize }}
       storageRetainPolicy: {{ .Values.datanode.storage.storageRetainPolicy }}
+      {{- if .Values.datanode.storage.walDir }}
+      walDir: {{ .Values.datanode.storage.walDir }}
+      {{- end }}
   {{- if (and .Values.prometheusMonitor (eq .Values.prometheusMonitor.enabled true ))}}
   prometheusMonitor: {{- toYaml .Values.prometheusMonitor | nindent 4 }}
   {{- end }}
@@ -67,6 +70,13 @@ spec:
     {{- else if .Values.storage.local }}
     local:
       directory: {{ .Values.storage.local.directory }}
+    {{- else if .Values.storage.oss }}
+    oss:
+      bucket: {{ .Values.storage.oss.bucket }}
+      region: {{ .Values.storage.oss.region }}
+      root: {{ .Values.storage.oss.root }}
+      secretName: {{ .Values.storage.oss.secretName }}
+      endpoint: {{ .Values.storage.oss.endpoint }}
     {{- else }}
     {}
     {{- end }}
diff --git a/charts/greptimedb/values.yaml b/charts/greptimedb/values.yaml
index 6862bef..e41bc1b 100644
--- a/charts/greptimedb/values.yaml
+++ b/charts/greptimedb/values.yaml
@@ -43,8 +43,8 @@ datanode:
     storageSize: 10Gi
     storageRetainPolicy: Retain
 
-#    # The wal directory of the storage, default is "/tmp/greptimedb/wal".
-#    walDir: "/tmp/greptimedb/wal"
+    # The wal directory of the storage, default is "/tmp/greptimedb/wal".
+    walDir: "/tmp/greptimedb/wal"
 
 initializer:
   registry: docker.io