From 6caa0912bc649b07c58bd707ac2242b5d4bdbde3 Mon Sep 17 00:00:00 2001 From: liyang Date: Thu, 16 May 2024 15:19:08 +0800 Subject: [PATCH] chore: remove opentsdb port (#128) * chore: remove opentsdb port * chore: updata docs --- charts/greptimedb-cluster/Chart.yaml | 2 +- charts/greptimedb-cluster/README.md | 5 ++--- charts/greptimedb-cluster/templates/cluster.yaml | 1 - charts/greptimedb-cluster/values.yaml | 4 +--- charts/greptimedb-operator/Chart.yaml | 4 ++-- charts/greptimedb-operator/README.md | 4 ++-- charts/greptimedb-operator/crds/greptimedbclusters.yaml | 3 --- charts/greptimedb-operator/crds/greptimedbstandalones.yaml | 3 --- charts/greptimedb-operator/values.yaml | 2 +- charts/greptimedb-standalone/Chart.yaml | 2 +- charts/greptimedb-standalone/README.md | 3 +-- charts/greptimedb-standalone/templates/service.yaml | 4 ---- charts/greptimedb-standalone/templates/statefulset.yaml | 3 --- charts/greptimedb-standalone/values.yaml | 2 -- 14 files changed, 11 insertions(+), 31 deletions(-) diff --git a/charts/greptimedb-cluster/Chart.yaml b/charts/greptimedb-cluster/Chart.yaml index 65f561d..1344230 100644 --- a/charts/greptimedb-cluster/Chart.yaml +++ b/charts/greptimedb-cluster/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: greptimedb-cluster description: A Helm chart for deploying GreptimeDB cluster in Kubernetes. type: application -version: 0.1.27 +version: 0.1.28 appVersion: 0.7.2 home: https://github.com/GreptimeTeam/greptimedb sources: diff --git a/charts/greptimedb-cluster/README.md b/charts/greptimedb-cluster/README.md index c6f2db3..03b9027 100644 --- a/charts/greptimedb-cluster/README.md +++ b/charts/greptimedb-cluster/README.md @@ -2,7 +2,7 @@ A Helm chart for deploying GreptimeDB cluster in Kubernetes. -![Version: 0.1.27](https://img.shields.io/badge/Version-0.1.27-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) +![Version: 0.1.28](https://img.shields.io/badge/Version-0.1.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) ## Source Code @@ -141,7 +141,7 @@ helm uninstall mycluster -n default | image.tag | string | `"v0.7.2"` | The image tag | | initializer.registry | string | `"docker.io"` | Initializer image registry | | initializer.repository | string | `"greptime/greptimedb-initializer"` | Initializer image repository | -| initializer.tag | string | `"0.1.0-alpha.23"` | Initializer image tag | +| initializer.tag | string | `"0.1.0-alpha.25"` | Initializer image tag | | meta | object | `{"config":"","etcdEndpoints":"etcd.default.svc.cluster.local:2379","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1,"storeKeyPrefix":""}` | Meta configure | | meta.config | string | `""` | Extra Meta config in toml format. | | meta.etcdEndpoints | string | `"etcd.default.svc.cluster.local:2379"` | Meta etcd endpoints | @@ -166,7 +166,6 @@ helm uninstall mycluster -n default | meta.storeKeyPrefix | string | `""` | Meta will store data with this key prefix | | mysqlServicePort | int | `4002` | GreptimeDB mysql service port | | objectStorage | object | `{"oss":{},"s3":{}}` | Configure to object storage | -| openTSDBServicePort | int | `4242` | GreptimeDB opentsdb service port | | postgresServicePort | int | `4003` | GreptimeDB postgres service port | | prometheusMonitor | object | `{"enabled":false,"interval":"30s","labels":{"release":"prometheus"}}` | Configure to prometheus PodMonitor | | prometheusMonitor.enabled | bool | `false` | Create PodMonitor resource for scraping metrics using PrometheusOperator | diff --git a/charts/greptimedb-cluster/templates/cluster.yaml b/charts/greptimedb-cluster/templates/cluster.yaml index 2c12967..f352095 100644 --- a/charts/greptimedb-cluster/templates/cluster.yaml +++ b/charts/greptimedb-cluster/templates/cluster.yaml @@ -211,7 +211,6 @@ spec: grpcServicePort: {{ .Values.grpcServicePort }} mysqlServicePort: {{ .Values.mysqlServicePort }} postgresServicePort: {{ .Values.postgresServicePort }} - openTSDBServicePort: {{ .Values.openTSDBServicePort }} initializer: image: '{{ .Values.initializer.registry }}/{{ .Values.initializer.repository }}:{{ .Values.initializer.tag }}' objectStorage: diff --git a/charts/greptimedb-cluster/values.yaml b/charts/greptimedb-cluster/values.yaml index 897a5c3..2766733 100644 --- a/charts/greptimedb-cluster/values.yaml +++ b/charts/greptimedb-cluster/values.yaml @@ -14,7 +14,7 @@ initializer: # -- Initializer image repository repository: greptime/greptimedb-initializer # -- Initializer image tag - tag: 0.1.0-alpha.23 + tag: 0.1.0-alpha.25 base: # -- The pod template for base @@ -258,8 +258,6 @@ grpcServicePort: 4001 mysqlServicePort: 4002 # -- GreptimeDB postgres service port postgresServicePort: 4003 -# -- GreptimeDB opentsdb service port -openTSDBServicePort: 4242 # -- Configure to prometheus PodMonitor prometheusMonitor: diff --git a/charts/greptimedb-operator/Chart.yaml b/charts/greptimedb-operator/Chart.yaml index 7ec47d2..784c358 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.24 -version: 0.1.15 +appVersion: 0.1.0-alpha.25 +version: 0.1.16 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 79a25a5..cf03425 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.1.15](https://img.shields.io/badge/Version-0.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0-alpha.24](https://img.shields.io/badge/AppVersion-0.1.0--alpha.24-informational?style=flat-square) +![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0-alpha.25](https://img.shields.io/badge/AppVersion-0.1.0--alpha.25-informational?style=flat-square) ## Source Code @@ -69,7 +69,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 | `"0.1.0-alpha.24"` | The image tag | +| image.tag | string | `"0.1.0-alpha.25"` | 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/crds/greptimedbclusters.yaml b/charts/greptimedb-operator/crds/greptimedbclusters.yaml index 5379a7e..0370f82 100644 --- a/charts/greptimedb-operator/crds/greptimedbclusters.yaml +++ b/charts/greptimedb-operator/crds/greptimedbclusters.yaml @@ -10726,9 +10726,6 @@ spec: type: string type: object type: object - openTSDBServicePort: - format: int32 - type: integer postgresServicePort: format: int32 type: integer diff --git a/charts/greptimedb-operator/crds/greptimedbstandalones.yaml b/charts/greptimedb-operator/crds/greptimedbstandalones.yaml index 35f9cc2..7250df3 100644 --- a/charts/greptimedb-operator/crds/greptimedbstandalones.yaml +++ b/charts/greptimedb-operator/crds/greptimedbstandalones.yaml @@ -2748,9 +2748,6 @@ spec: type: string type: object type: object - openTSDBServicePort: - format: int32 - type: integer postgresServicePort: format: int32 type: integer diff --git a/charts/greptimedb-operator/values.yaml b/charts/greptimedb-operator/values.yaml index 7b12062..4f15c87 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: 0.1.0-alpha.24 + tag: 0.1.0-alpha.25 # -- The image pull secrets pullSecrets: [] diff --git a/charts/greptimedb-standalone/Chart.yaml b/charts/greptimedb-standalone/Chart.yaml index e61bf79..fa4ed83 100644 --- a/charts/greptimedb-standalone/Chart.yaml +++ b/charts/greptimedb-standalone/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: greptimedb-standalone description: A Helm chart for deploying standalone greptimedb type: application -version: 0.1.13 +version: 0.1.14 appVersion: 0.7.2 home: https://github.com/GreptimeTeam/greptimedb sources: diff --git a/charts/greptimedb-standalone/README.md b/charts/greptimedb-standalone/README.md index 683511b..797baa9 100644 --- a/charts/greptimedb-standalone/README.md +++ b/charts/greptimedb-standalone/README.md @@ -2,7 +2,7 @@ A Helm chart for deploying standalone greptimedb -![Version: 0.1.13](https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) +![Version: 0.1.14](https://img.shields.io/badge/Version-0.1.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.2](https://img.shields.io/badge/AppVersion-0.7.2-informational?style=flat-square) ## Source Code - https://github.com/GreptimeTeam/greptimedb @@ -73,7 +73,6 @@ helm uninstall greptimedb-standalone -n default | nameOverride | string | `""` | Overrides the chart's name | | nodeSelector | object | `{}` | NodeSelector to apply pod | | objectStorage | object | `{"oss":{},"s3":{}}` | Configure to object storage | -| opentsdbServicePort | int | `4242` | GreptimeDB opentsdb service port | | persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | persistence.enabled | bool | `true` | Enable persistent disk | | persistence.mountPath | string | `"/data/greptimedb"` | Mount path of persistent disk. | diff --git a/charts/greptimedb-standalone/templates/service.yaml b/charts/greptimedb-standalone/templates/service.yaml index d6e9b60..77fb446 100644 --- a/charts/greptimedb-standalone/templates/service.yaml +++ b/charts/greptimedb-standalone/templates/service.yaml @@ -27,9 +27,5 @@ spec: port: {{ .Values.postgresServicePort }} targetPort: {{ .Values.postgresServicePort }} protocol: TCP - - name: opentsdb - port: {{ .Values.opentsdbServicePort }} - targetPort: {{ .Values.opentsdbServicePort }} - protocol: TCP selector: {{- include "greptimedb-standalone.selectorLabels" . | nindent 4 }} diff --git a/charts/greptimedb-standalone/templates/statefulset.yaml b/charts/greptimedb-standalone/templates/statefulset.yaml index 5d3ee00..efc8ee1 100644 --- a/charts/greptimedb-standalone/templates/statefulset.yaml +++ b/charts/greptimedb-standalone/templates/statefulset.yaml @@ -86,9 +86,6 @@ spec: - containerPort: {{ .Values.postgresServicePort }} name: postgres protocol: TCP - - containerPort: {{ .Values.opentsdbServicePort }} - name: opentsdb - protocol: TCP {{- if .Values.env }} env: {{- range $key, $val := .Values.env }} diff --git a/charts/greptimedb-standalone/values.yaml b/charts/greptimedb-standalone/values.yaml index 5628898..8ecacbb 100644 --- a/charts/greptimedb-standalone/values.yaml +++ b/charts/greptimedb-standalone/values.yaml @@ -168,8 +168,6 @@ grpcServicePort: 4001 mysqlServicePort: 4002 # -- GreptimeDB postgres service port postgresServicePort: 4003 -# -- GreptimeDB opentsdb service port -opentsdbServicePort: 4242 service: # -- Service type