Skip to content

Commit

Permalink
Merge pull request apache#296 from intelligentfu8/remove-selectdb
Browse files Browse the repository at this point in the history
selectdb to apache
  • Loading branch information
catpineapple authored Nov 25, 2024
2 parents 8b06624 + 56ad220 commit 234dc18
Show file tree
Hide file tree
Showing 8 changed files with 8,071 additions and 211 deletions.
4 changes: 2 additions & 2 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ header:
- "**/*.json"
- "**/*.txt"
- '**/.helmignore'
- 'helm-charts/doris-operator/crds/doris.selectdb.com_dorisclusters.yaml'
- 'helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml'
- 'LICENSE'
- 'NOTICE'
- 'PROJECT'
Expand All @@ -26,4 +26,4 @@ header:
# If you don't want to check dependencies' license compatibility, remove the following part
dependency:
files:
- go.mod
- go.mod
103 changes: 0 additions & 103 deletions DISAGGREGATED-README-CN.md

This file was deleted.

104 changes: 0 additions & 104 deletions DISAGGREGATED-README.md

This file was deleted.

2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
#cat config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml > config/crd/bases/crds.yaml
#cat config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml >> config/crd/bases/crds.yaml
#cat config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml >> config/crd/bases/crds.yaml
cp config/crd/bases/doris.selectdb.com_dorisclusters.yaml config/crd/bases/doris.apache.com_dorisclusters.yaml
mv helm-charts/doris-operator/crds/doris.selectdb.com_dorisclusters.yaml helm-charts/doris-operator/crds/doris.apache.com_dorisclusters.yaml
cat config/crd/bases/doris.selectdb.com_dorisclusters.yaml > config/crd/bases/crds.yaml
cat config/crd/bases/disaggregated.cluster.doris.com_dorisdisaggregatedclusters.yaml >> config/crd/bases/crds.yaml
#cat config/crd/bases/disaggregated.metaservice.doris.com_dorisdisaggregatedmetaservices.yaml >> config/crd/bases/crds.yaml
Expand Down
2 changes: 1 addition & 1 deletion README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Doris-Operator 用于在 Kubernetes 上创建、配置和管理 Doris 集群,
## 安装
1. 安装 DorisCluster 资源定义:
```
kubectl create -f https://raw.githubusercontent.com/apache/doris-operator/$(curl -s https://api.github.com/repos/apache/doris-operator/releases/latest | grep tag_name | cut -d '"' -f4)/config/crd/bases/doris.selectdb.com_dorisclusters.yaml
kubectl create -f https://raw.githubusercontent.com/apache/doris-operator/$(curl -s https://api.github.com/repos/apache/doris-operator/releases/latest | grep tag_name | cut -d '"' -f4)/config/crd/bases/doris.apache.com_dorisclusters.yaml
```
2. 安装 Doris-Operator 服务以及所依赖的 RBAC 权限等相关资源
```
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Users custom `DorisCluster` CRD to deploy doris as demand.
## Installation
1. Install custom resource definitions:
```
kubectl create -f https://raw.githubusercontent.com/apache/doris-operator/$(curl -s https://api.github.com/repos/apache/doris-operator/releases/latest | grep tag_name | cut -d '"' -f4)/config/crd/bases/doris.selectdb.com_dorisclusters.yaml
kubectl create -f https://raw.githubusercontent.com/apache/doris-operator/$(curl -s https://api.github.com/repos/apache/doris-operator/releases/latest | grep tag_name | cut -d '"' -f4)/config/crd/bases/doris.apache.com_dorisclusters.yaml
```
2. Install the operator with its RBAC rules:
the default deployed namespace is doris, when deploy on specific namespace, please pull yaml and update `namespace` field.
Expand Down
Loading

0 comments on commit 234dc18

Please sign in to comment.