Skip to content

Commit

Permalink
Merge pull request #29 from Al-assad/hot-cold-separation
Browse files Browse the repository at this point in the history
update operator version to 1.0.3
  • Loading branch information
Al-assad authored Nov 26, 2023
2 parents d59fe64 + 3ae6375 commit a6708ed
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 13 deletions.
4 changes: 2 additions & 2 deletions deploy/helm/doris-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.2
version: 1.0.3
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v1.0.2"
appVersion: "v1.0.3"
23 changes: 23 additions & 0 deletions deploy/helm/doris-operator/crds/doriscluster-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2227,10 +2227,33 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
retainDefaultStorage:
type: boolean
serviceAccount:
type: string
statefulSetUpdateStrategy:
type: string
storage:
items:
properties:
medium:
type: string
name:
type: string
request:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
storageClassName:
type: string
required:
- name
- request
- storageClassName
type: object
type: array
storageClassName:
type: string
tolerations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/doris-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# doris operator controller main container configuration
manager:
# controller container image
image: ghcr.io/linsoss/doris-operator:1.0.2
image: ghcr.io/linsoss/doris-operator:1.0.3
# controller container resources
resources: { }

Expand Down
23 changes: 23 additions & 0 deletions deploy/kustomize/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2916,10 +2916,33 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
retainDefaultStorage:
type: boolean
serviceAccount:
type: string
statefulSetUpdateStrategy:
type: string
storage:
items:
properties:
medium:
type: string
name:
type: string
request:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
storageClassName:
type: string
required:
- name
- request
- storageClassName
type: object
type: array
storageClassName:
type: string
tolerations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kustomize/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/linsoss/doris-operator
newTag: 1.0.2
newTag: 1.0.3

namespace: doris-operator-system
namePrefix: doris-operator-
Expand Down
25 changes: 24 additions & 1 deletion deploy/kustomize/kustomized.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2929,10 +2929,33 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
retainDefaultStorage:
type: boolean
serviceAccount:
type: string
statefulSetUpdateStrategy:
type: string
storage:
items:
properties:
medium:
type: string
name:
type: string
request:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
storageClassName:
type: string
required:
- name
- request
- storageClassName
type: object
type: array
storageClassName:
type: string
tolerations:
Expand Down Expand Up @@ -9875,7 +9898,7 @@ spec:
- --leader-elect
command:
- /manager
image: ghcr.io/linsoss/doris-operator:1.0.2
image: ghcr.io/linsoss/doris-operator:1.0.3
livenessProbe:
httpGet:
path: /healthz
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/helm/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ 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.2
helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version 1.0.3
```

## Values

| **Key** | **Type** | **Default** | **Description** |
|---------------------|----------|--------------------------------------|--------------------------------------------|
| manager.image | string | ghcr.io/linsoss/doris-operator:1.0.2 | Controller container image tag |
| 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 |
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/helm/index.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ 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.2
helm upgrade -i doris-operator oci://ghcr.io/linsoss/helm/doris-operator --version 1.0.3
```

## Values

| **Key** | **Type** | **Default** | **Description** |
|---------------------|----------|--------------------------------------|--------------------------------------------|
| manager.image | string | ghcr.io/linsoss/doris-operator:1.0.2 | Controller container image tag |
| 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 |
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/kustomized/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2 --output ./doris-operator/
flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
```

## Install Operator
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/kustomized/index.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2 --output ./doris-operator/
flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
```

## 安装 Operator
Expand Down
2 changes: 1 addition & 1 deletion docs/prologue/get-started/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Install Doris Operator:

```shell
mkdir doris-operator
flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.2 --output ./doris-operator/
flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
kubectl apply -k doris-operator
```

Expand Down
2 changes: 1 addition & 1 deletion docs/prologue/get-started/index.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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.2 --output ./doris-operator/
flux pull artifact oci://ghcr.io/linsoss/kustomize/doris-operator:1.0.3 --output ./doris-operator/
kubectl apply -k doris-operator
```

Expand Down

0 comments on commit a6708ed

Please sign in to comment.