Merge pull request #35 from Al-assad/dev_main

Update default Doris image version to 2.0.3
linsoss · Dec 20, 2023 · a4c9b7f · a4c9b7f
2 parents 59677a3 + ae56754
commit a4c9b7f
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 66 deletions.
diff --git a/docs/deploy/configure-doris-cluster/index.md b/docs/deploy/configure-doris-cluster/index.md
@@ -59,7 +59,7 @@ It is recommended to configure `spec.<fe/be/cn/broker>.baseImage` and `spec.vers
 
 Here are the formats of the parameters:
 
-- `spec.version`: the format is `imageTag`, such as `2.0.2`
+- `spec.version`: the format is `imageTag`, such as `{{< param last_doris_image_version >}}`
 - `spec.<fe/be/cn/broker>.baseImage`: the format is `imageName`, such as `ghcr.io/linsoss/doris-fe`
 
 Please note that you must use the Doris images built

diff --git a/docs/deploy/configure-doris-cluster/index.zh.md b/docs/deploy/configure-doris-cluster/index.zh.md
@@ -48,7 +48,7 @@ Doris 集群中。
 
 相关参数的格式如下：
 
-- `spec.version`，格式为 `imageTag`，例如 `2.0.2`
+- `spec.version`，格式为 `imageTag`，例如 `{{< param last_doris_image_version >}}`
 - `spec.<fe/be/cn/broker>.baseImage`，格式为 `imageName`，例如 `ghcr.io/linsoss/doris-fe` ；
 
 请注意必须使用 [doris-operator/images](https://github.com/linsoss/doris-operator/tree/dev/images)  进行构建的 Doris

diff --git a/docs/deploy/deploy-doris-cluster/index.md b/docs/deploy/deploy-doris-cluster/index.md
@@ -31,13 +31,13 @@ This document describes how to deploy a Doris cluster on general Kubernetes.
    cluster on a machine that has internet access and then upload them to the server. Afterwards, use `docker load` to
    install the Docker images on the server.
 
-   Deploying a Doris cluster will require the following Docker images (assuming Doris cluster version is 2.0.2):
+   Deploying a Doris cluster will require the following Docker images (assuming Doris cluster version is {{< param last_doris_image_version >}}):
 
     ```shell
-    ghcr.io/linsoss/doris-fe:2.0.2
-    ghcr.io/linsoss/doris-be:2.0.2
-    ghcr.io/linsoss/doris-cn:2.0.2
-    ghcr.io/linsoss/doris-broker:2.0.2
+    ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     prom/prometheus:v2.37.8
     grafana/grafana:9.5.2
     grafana/loki:2.9.1
@@ -49,21 +49,21 @@ This document describes how to deploy a Doris cluster on general Kubernetes.
    Then download all these images using the following command:
 
     ```shell
-    docker pull ghcr.io/linsoss/doris-fe:2.0.2
-    docker pull ghcr.io/linsoss/doris-be:2.0.2
-    docker pull ghcr.io/linsoss/doris-cn:2.0.2
-    docker pull ghcr.io/linsoss/doris-broker:2.0.2
+    docker pull ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     docker pull prom/prometheus:v2.37.8
     docker pull grafana/grafana:9.5.2
     docker pull grafana/loki:2.9.1
     docker pull grafana/promtail:2.9.1
     docker pull tnir/mysqlclient:1.4.6
     docker pull busybox:1.36
     
-    docker save -o doris-fe-2.0.2.tar ghcr.io/linsoss/doris-fe:2.0.2
-    docker save -o doris-be-2.0.2.tar ghcr.io/linsoss/doris-be:2.0.2
-    docker save -o doris-cn-2.0.2.tar ghcr.io/linsoss/doris-cn:2.0.2
-    docker save -o doris-broker-2.0.2.tar ghcr.io/linsoss/doris-broker:2.0.2
+    docker save -o doris-fe-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    docker save -o doris-be-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    docker save -o doris-cn-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    docker save -o doris-broker-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     docker save -o prometheus-v2.37.8.tar prom/prometheus:v2.37.8
     docker save -o grafana-9.5.2.tar grafana/grafana:9.5.2
     docker save -o loki-2.9.1.tar grafana/loki:2.9.1
@@ -76,10 +76,10 @@ This document describes how to deploy a Doris cluster on general Kubernetes.
    the server:
 
     ```shell
-    docker load -i doris-fe-2.0.2.tar
-    docker load -i doris-be-2.0.2.tar
-    docker load -i doris-cn-2.0.2.tar
-    docker load -i doris-broker-2.0.2.tar
+    docker load -i doris-fe-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-be-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-cn-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-broker-{{< param last_doris_image_version >}}.tar
     docker load -i prometheus-v2.37.8.tar
     docker load -i grafana-9.5.2.tar
     docker load -i loki-2.9.1.tar

diff --git a/docs/deploy/deploy-doris-cluster/index.zh.md b/docs/deploy/deploy-doris-cluster/index.zh.md
@@ -31,13 +31,13 @@ weight: 330
    如果 Kubernetes 服务器无法连接外网，需要在有外网的机器上将 Doris 集群用到的 Docker
    镜像下载下来并上传到服务器上，然后使用 `docker load` 将 Docker 镜像安装到服务器上。
 
-   部署一套 Doris 集群会用到下面这些 Docker 镜像（假设 Doris 集群版本为 2.0.2）:
+   部署一套 Doris 集群会用到下面这些 Docker 镜像（假设 Doris 集群版本为 {{< param last_doris_image_version >}}）:
 
     ```shell
-    ghcr.io/linsoss/doris-fe:2.0.2
-    ghcr.io/linsoss/doris-be:2.0.2
-    ghcr.io/linsoss/doris-cn:2.0.2
-    ghcr.io/linsoss/doris-broker:2.0.2
+    ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     prom/prometheus:v2.37.8
     grafana/grafana:9.5.2
     grafana/loki:2.9.1
@@ -49,21 +49,21 @@ weight: 330
    接下来通过下面的命令将所有这些镜像下载下来：
 
     ```shell
-    docker pull ghcr.io/linsoss/doris-fe:2.0.2
-    docker pull ghcr.io/linsoss/doris-be:2.0.2
-    docker pull ghcr.io/linsoss/doris-cn:2.0.2
-    docker pull ghcr.io/linsoss/doris-broker:2.0.2
+    docker pull ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    docker pull ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     docker pull prom/prometheus:v2.37.8
     docker pull grafana/grafana:9.5.2
     docker pull grafana/loki:2.9.1
     docker pull grafana/promtail:2.9.1
     docker pull tnir/mysqlclient:1.4.6
     docker pull busybox:1.36
     
-    docker save -o doris-fe-2.0.2.tar ghcr.io/linsoss/doris-fe:2.0.2
-    docker save -o doris-be-2.0.2.tar ghcr.io/linsoss/doris-be:2.0.2
-    docker save -o doris-cn-2.0.2.tar ghcr.io/linsoss/doris-cn:2.0.2
-    docker save -o doris-broker-2.0.2.tar ghcr.io/linsoss/doris-broker:2.0.2
+    docker save -o doris-fe-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-fe:{{< param last_doris_image_version >}}
+    docker save -o doris-be-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-be:{{< param last_doris_image_version >}}
+    docker save -o doris-cn-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-cn:{{< param last_doris_image_version >}}
+    docker save -o doris-broker-{{< param last_doris_image_version >}}.tar ghcr.io/linsoss/doris-broker:{{< param last_doris_image_version >}}
     docker save -o prometheus-v2.37.8.tar prom/prometheus:v2.37.8
     docker save -o grafana-9.5.2.tar grafana/grafana:9.5.2
     docker save -o loki-2.9.1.tar grafana/loki:2.9.1
@@ -75,10 +75,10 @@ weight: 330
    接下来将这些 Docker 镜像上传到服务器上，并执行 `docker load` 将这些 Docker 镜像安装到服务器上：
 
     ```shell
-    docker load -i doris-fe-2.0.2.tar
-    docker load -i doris-be-2.0.2.tar
-    docker load -i doris-cn-2.0.2.tar
-    docker load -i doris-broker-2.0.2.tar
+    docker load -i doris-fe-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-be-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-cn-{{< param last_doris_image_version >}}.tar
+    docker load -i doris-broker-{{< param last_doris_image_version >}}.tar
     docker load -i prometheus-v2.37.8.tar
     docker load -i grafana-9.5.2.tar
     docker load -i loki-2.9.1.tar

diff --git a/docs/installation/helm/index.md b/docs/installation/helm/index.md
@@ -8,17 +8,17 @@ weight: 220
 This is a OCI helm chart, helm started to support OCI in version 3.8.0.
 
 ```shell
-helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version 1.0.3
+helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version {{< param last_doris_operator_version >}}
 ```
 
 ## Values
 
-| **Key**             | **Type** | **Default**                          | **Description**                            |
-|---------------------|----------|--------------------------------------|--------------------------------------------|
-| manager.image       | string   | ghcr.io/linsoss/doris-operator:1.0.3 | Controller container image tag             |
-| manager.resources   | object   | {}                                   | Controller container resource requirement  |
-| rbacProxy.image     | string   | bitnami/kube-rbac-proxy:0.14.1       | rbac-proxy container image tag             |
-| rbacProxy.resources | object   | {}                                   | rbac-proxy container resource requirements |
-| imagePullPolicy     | string   | IfNotPresent                         | image pull policy                          |
-| imagePullSecrets    | list     | []                                   | image pull secrets                         |
+| **Key**             | **Type** | **Default**                                                              | **Description**                            |
+|---------------------|----------|--------------------------------------------------------------------------|--------------------------------------------|
+| manager.image       | string   | ghcr.io/linsoss/doris-operator:{{< param last_doris_operator_version >}} | Controller container image tag             |
+| manager.resources   | object   | {}                                                                       | Controller container resource requirement  |
+| rbacProxy.image     | string   | bitnami/kube-rbac-proxy:0.14.1                                           | rbac-proxy container image tag             |
+| rbacProxy.resources | object   | {}                                                                       | rbac-proxy container resource requirements |
+| imagePullPolicy     | string   | IfNotPresent                                                             | image pull policy                          |
+| imagePullSecrets    | list     | []                                                                       | image pull secrets                         |
 
diff --git a/docs/installation/helm/index.zh.md b/docs/installation/helm/index.zh.md
@@ -8,17 +8,17 @@ weight: 220
 以下通过 OCI 安装 Doris operator helm chart 的方式，helm 在 3.8.0 开始支持 OCI。
 
 ```shell
-helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version 1.0.3
+helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version {{< param last_doris_operator_version >}}
 ```
 
 ## Values
 
-| **Key**             | **Type** | **Default**                          | **Description**                            |
-|---------------------|----------|--------------------------------------|--------------------------------------------|
-| manager.image       | string   | ghcr.io/linsoss/doris-operator:1.0.3 | Controller container image tag             |
-| manager.resources   | object   | {}                                   | Controller container resource requirement  |
-| rbacProxy.image     | string   | bitnami/kube-rbac-proxy:0.14.1       | rbac-proxy container image tag             |
-| rbacProxy.resources | object   | {}                                   | rbac-proxy container resource requirements |
-| imagePullPolicy     | string   | IfNotPresent                         | image pull policy                          |
-| imagePullSecrets    | list     | []                                   | image pull secrets                         |
+| **Key**             | **Type** | **Default**                                                              | **Description**                            |
+|---------------------|----------|--------------------------------------------------------------------------|--------------------------------------------|
+| manager.image       | string   | ghcr.io/linsoss/doris-operator:{{< param last_doris_operator_version >}} | Controller container image tag             |
+| manager.resources   | object   | {}                                                                       | Controller container resource requirement  |
+| rbacProxy.image     | string   | bitnami/kube-rbac-proxy:0.14.1                                           | rbac-proxy container image tag             |
+| rbacProxy.resources | object   | {}                                                                       | rbac-proxy container resource requirements |
+| imagePullPolicy     | string   | IfNotPresent                                                             | image pull policy                          |
+| imagePullSecrets    | list     | []                                                                       | image pull secrets                         |
 
diff --git a/docs/installation/kustomized/index.md b/docs/installation/kustomized/index.md
@@ -35,7 +35,7 @@ This will provide you the manifest files unpacked and ready to use.
 
 ```shell
 mkdir doris-operator
-flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
+flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:{{< param last_doris_operator_version >}} --output ./doris-operator/
 ```
 
 ## Install Operator

diff --git a/docs/installation/kustomized/index.zh.md b/docs/installation/kustomized/index.zh.md
@@ -31,7 +31,7 @@ curl -s https://fluxcd.io/install.sh | sudo bash
 
 ```shell
 mkdir doris-operator
-flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
+flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:{{< param last_doris_operator_version >}} --output ./doris-operator/
 ```
 
 ## 安装 Operator

diff --git a/docs/prologue/get-started/index.md b/docs/prologue/get-started/index.md
@@ -87,7 +87,7 @@ Install Doris Operator：
 
 ```shell
 mkdir doris-operator
-flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
+flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:{{< param last_doris_operator_version >}} --output ./doris-operator/
 kubectl apply -k doris-operator
 ```
 

diff --git a/docs/prologue/get-started/index.zh.md b/docs/prologue/get-started/index.zh.md
@@ -75,11 +75,11 @@ curl -s https://fluxcd.io/install.sh | sudo bash
 
 ```shell
 mkdir doris-operator
-flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
+flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:{{< param last_doris_operator_version >}} --output ./doris-operator/
 kubectl apply -k doris-operator
 ```
 
-检查Doris Operator 组件是否正常运行：
+检查 Doris Operator 组件是否正常运行：
 
 ```shell
 kubectl get pods -n doris-operator-system

diff --git a/examples/advanced/doris-cluster.yaml b/examples/advanced/doris-cluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: basic
 spec:
   # Image tag of fe, be, cn and broker components.
-  version: 2.0.2
+  version: 2.0.3
 
   ###############################
   # Cluster Global Configuration #

diff --git a/examples/basic-autoscale/doris-cluster.yaml b/examples/basic-autoscale/doris-cluster.yaml
@@ -3,7 +3,7 @@ kind: DorisCluster
 metadata:
   name: basic
 spec:
-  version: 2.0.2
+  version: 2.0.3
 
   fe:
     baseImage: ghcr.io/linsoss/doris-fe

diff --git a/examples/basic-hadoop-conf/doris-cluster.yaml b/examples/basic-hadoop-conf/doris-cluster.yaml
@@ -3,7 +3,7 @@ kind: DorisCluster
 metadata:
   name: basic
 spec:
-  version: 2.0.2
+  version: 2.0.3
   fe:
     baseImage: ghcr.io/linsoss/doris-fe
     replicas: 3

diff --git a/examples/basic-initialize/doris-cluster.yaml b/examples/basic-initialize/doris-cluster.yaml
@@ -3,7 +3,7 @@ kind: DorisCluster
 metadata:
   name: basic
 spec:
-  version: 2.0.2
+  version: 2.0.3
   fe:
     baseImage: ghcr.io/linsoss/doris-fe
     replicas: 1

diff --git a/examples/basic/doris-cluster.yaml b/examples/basic/doris-cluster.yaml
@@ -8,7 +8,7 @@ metadata:
   name: basic
 spec:
   # Image tag of fe, be, cn and broker components.
-  version: 2.0.2
+  version: 2.0.3
 
   ## Doris FE configuration.
   # When this "fe" configuration key is not set, the Doris FE component will not be deployed,

diff --git a/examples/basic_cn_special/doris-cluster.yaml b/examples/basic_cn_special/doris-cluster.yaml
@@ -7,7 +7,7 @@ kind: DorisCluster
 metadata:
   name: basic
 spec:
-  version: 2.0.2
+  version: 2.0.3
   busyBoxImage: dockerproxy.com/library/busybox:1.36
 
   fe:

diff --git a/examples/be-multiple-storage/doris-cluster.yaml b/examples/be-multiple-storage/doris-cluster.yaml
@@ -3,7 +3,7 @@ kind: DorisCluster
 metadata:
   name: basic
 spec:
-  version: 2.0.2
+  version: 2.0.3
   fe:
     baseImage: ghcr.io/linsoss/doris-fe
     replicas: 3

diff --git a/website/config/_default/params.yml b/website/config/_default/params.yml
@@ -1,3 +1,9 @@
+# last doris images version
+last_doris_image_version: "2.0.3"
+# last doris operator version
+last_doris_operator_version: "1.0.3"
+
+
 # Images (@hyas/images)
 image:
   ## General