From c5cf6f7e3842f71217ca6419f8ab25020c2365af Mon Sep 17 00:00:00 2001 From: zyy17 Date: Thu, 7 Nov 2024 17:16:30 +0800 Subject: [PATCH] refactor: bump operator version to v0.1.3-alpha.3 (#192) --- charts/greptimedb-operator/Chart.yaml | 4 ++-- charts/greptimedb-operator/README.md | 8 ++++--- .../templates/clusterrole.yaml | 9 +++++++ .../templates/crds/crd-greptimedbcluster.yaml | 24 +++++++++++++++++++ .../crds/crd-greptimedbstandalone.yaml | 4 ++++ .../templates/deployment.yaml | 3 +++ charts/greptimedb-operator/values.yaml | 7 +++++- 7 files changed, 53 insertions(+), 6 deletions(-) diff --git a/charts/greptimedb-operator/Chart.yaml b/charts/greptimedb-operator/Chart.yaml index e808714..3f9ac5b 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.3-alpha.1 -version: 0.2.9 +appVersion: 0.1.3-alpha.3 +version: 0.2.10 type: application home: https://github.com/GreptimeTeam/greptimedb-operator sources: diff --git a/charts/greptimedb-operator/README.md b/charts/greptimedb-operator/README.md index 4a442b1..7c729cd 100644 --- a/charts/greptimedb-operator/README.md +++ b/charts/greptimedb-operator/README.md @@ -2,7 +2,7 @@ The greptimedb-operator Helm chart for Kubernetes. -![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3-alpha.1](https://img.shields.io/badge/AppVersion-0.1.3--alpha.1-informational?style=flat-square) +![Version: 0.2.10](https://img.shields.io/badge/Version-0.2.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.3-alpha.3](https://img.shields.io/badge/AppVersion-0.1.3--alpha.3-informational?style=flat-square) ## Source Code @@ -101,8 +101,10 @@ Kubernetes: `>=1.18.0-0` | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | The pod affinity | -| apiServer | object | `{"enabled":false,"port":8081}` | The configuration for the operator API server | +| apiServer | object | `{"enabled":false,"podMetrics":{"enabled":false},"port":8081}` | The configuration for the operator API server | | apiServer.enabled | bool | `false` | Whether to enable the API server | +| apiServer.podMetrics | object | `{"enabled":false}` | The configuration for getting PodMetrics from metrics-server. | +| apiServer.podMetrics.enabled | bool | `false` | Whether to enable to get PodMetrics from metrics-server. | | apiServer.port | int | `8081` | The port for the API server | | crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs | | crds.annotations | object | `{}` | Annotations to be added to all CRDs | @@ -113,7 +115,7 @@ Kubernetes: `>=1.18.0-0` | image.pullSecrets | list | `[]` | The image pull secrets | | image.registry | string | `"docker.io"` | The image registry | | image.repository | string | `"greptime/greptimedb-operator"` | The image repository | -| image.tag | string | `"v0.1.3-alpha.1"` | The image tag | +| image.tag | string | `"v0.1.3-alpha.3"` | The image tag | | nameOverride | string | `""` | String to partially override release template name | | nodeSelector | object | `{}` | The operator node selector | | rbac.create | bool | `true` | Install role based access control | diff --git a/charts/greptimedb-operator/templates/clusterrole.yaml b/charts/greptimedb-operator/templates/clusterrole.yaml index a63063d..516e310 100644 --- a/charts/greptimedb-operator/templates/clusterrole.yaml +++ b/charts/greptimedb-operator/templates/clusterrole.yaml @@ -161,4 +161,13 @@ rules: - patch - update - watch + {{- if and .Values.apiServer.enabled .Values.apiServer.podMetrics.enabled }} + - apiGroups: + - metrics.k8s.io + resources: + - pods + verbs: + - get + - list + {{- end }} {{- end }} diff --git a/charts/greptimedb-operator/templates/crds/crd-greptimedbcluster.yaml b/charts/greptimedb-operator/templates/crds/crd-greptimedbcluster.yaml index 32a92dc..9136d1d 100644 --- a/charts/greptimedb-operator/templates/crds/crd-greptimedbcluster.yaml +++ b/charts/greptimedb-operator/templates/crds/crd-greptimedbcluster.yaml @@ -2910,6 +2910,10 @@ spec: type: integer logging: properties: + filters: + items: + type: string + type: array format: enum: - json @@ -5820,6 +5824,10 @@ spec: type: string logging: properties: + filters: + items: + type: string + type: array format: enum: - json @@ -8713,6 +8721,10 @@ spec: type: integer logging: properties: + filters: + items: + type: string + type: array format: enum: - json @@ -11639,6 +11651,10 @@ spec: type: object logging: properties: + filters: + items: + type: string + type: array format: enum: - json @@ -11690,6 +11706,10 @@ spec: type: integer logging: properties: + filters: + items: + type: string + type: array format: enum: - json @@ -17466,6 +17486,10 @@ spec: type: object logging: properties: + filters: + items: + type: string + type: array format: enum: - json diff --git a/charts/greptimedb-operator/templates/crds/crd-greptimedbstandalone.yaml b/charts/greptimedb-operator/templates/crds/crd-greptimedbstandalone.yaml index f9d06b5..ce71aca 100644 --- a/charts/greptimedb-operator/templates/crds/crd-greptimedbstandalone.yaml +++ b/charts/greptimedb-operator/templates/crds/crd-greptimedbstandalone.yaml @@ -2923,6 +2923,10 @@ spec: type: object logging: properties: + filters: + items: + type: string + type: array format: enum: - json diff --git a/charts/greptimedb-operator/templates/deployment.yaml b/charts/greptimedb-operator/templates/deployment.yaml index 499f68c..3ef60fd 100644 --- a/charts/greptimedb-operator/templates/deployment.yaml +++ b/charts/greptimedb-operator/templates/deployment.yaml @@ -58,7 +58,10 @@ spec: {{- if .Values.apiServer.enabled }} - --enable-apiserver - --apiserver-port={{ .Values.apiServer.port }} + {{- if .Values.apiServer.podMetrics.enabled }} + - --enable-pod-metrics {{- end }} + {{- end}} command: - greptimedb-operator {{- if .Values.resources }} diff --git a/charts/greptimedb-operator/values.yaml b/charts/greptimedb-operator/values.yaml index fe8ea76..988c4d7 100644 --- a/charts/greptimedb-operator/values.yaml +++ b/charts/greptimedb-operator/values.yaml @@ -8,7 +8,7 @@ image: # -- The image pull policy for the controller imagePullPolicy: IfNotPresent # -- The image tag - tag: v0.1.3-alpha.1 + tag: v0.1.3-alpha.3 # -- The image pull secrets pullSecrets: [] @@ -70,3 +70,8 @@ apiServer: # -- The port for the API server port: 8081 + + # -- The configuration for getting PodMetrics from metrics-server. + podMetrics: + # -- Whether to enable to get PodMetrics from metrics-server. + enabled: false