Skip to content

Commit 58a3789

Browse files
[Maintenance] Simplify and update README file (#1430)
* Simplify and update README file - remove duplicated information - fix typos - update information on Upgrade process - update helm commands to be compatible with latest Helm version
1 parent 05e5881 commit 58a3789

File tree

1 file changed

+63
-115
lines changed

1 file changed

+63
-115
lines changed

README.md

Lines changed: 63 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ state for individual new features, since we expect that new
3030
features will first be released with an "alpha" or "beta" readiness
3131
state and over time move to full "production readiness".
3232

33-
Operator will supports versions supported on providers and maintained by Kubernetes.
33+
Operator will support Kubernetes versions supported on providers and maintained by Kubernetes.
3434
Once version is not supported anymore it will go into "Deprecating" state and will be marked as deprecated on Minor release.
3535

3636
Kubernetes versions starting from 1.18 are supported and tested, charts and manifests can use API Versions which are not present in older versions.
@@ -102,12 +102,18 @@ To upgrade to the Enterprise Edition, you need to get in touch with the ArangoDB
102102

103103
<!-- END(featuresEnterpriseTable) -->
104104

105-
## Operator Community Edition (CE)
105+
## Installation and Usage
106106

107-
Image: `arangodb/kube-arangodb:1.2.34`
107+
Docker images:
108+
- Community Edition: `arangodb/kube-arangodb:1.2.34`
109+
- Enterprise Edition: `arangodb/kube-arangodb-enterprise:1.2.34`
108110

109-
### Installation of latest CE release using Kubectl
111+
### Installation of latest release using Kubectl
110112

113+
This procedure can also be used for upgrades and will not harm any
114+
running ArangoDB deployments.
115+
116+
##### Community Edition
111117
```bash
112118
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/arango-crd.yaml
113119
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/arango-deployment.yaml
@@ -117,83 +123,7 @@ kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34
117123
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/arango-deployment-replication.yaml
118124
```
119125

120-
This procedure can also be used for upgrades and will not harm any
121-
running ArangoDB deployments.
122-
123-
### Installation of latest CE release using kustomize
124-
125-
Installation using [kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) looks like installation from yaml files,
126-
but user is allowed to modify namespace or resource names without yaml modifications.
127-
128-
IT is recommended to use kustomization instead of handcrafting namespace in yaml files - kustomization will replace not only resource namespaces,
129-
but also namespace references in resources like ClusterRoleBinding.
130-
131-
Example kustomization file:
132-
```
133-
apiVersion: kustomize.config.k8s.io/v1beta1
134-
kind: Kustomization
135-
136-
namespace: my-custom-namespace
137-
138-
bases:
139-
- https://github.com/arangodb/kube-arangodb/manifests/kustomize/deployment/?ref=1.0.3
140-
```
141-
142-
### Installation of latest CE release using Helm
143-
144-
Only use this procedure for a new install of the operator. See below for
145-
upgrades.
146-
147-
```bash
148-
# The following will install the operator for `ArangoDeployment` &
149-
# `ArangoDeploymentReplication` resources.
150-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz
151-
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
152-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.features.storage=true"
153-
```
154-
155-
### Upgrading the operator using Helm
156-
157-
To upgrade the operator to the latest version with Helm, you have to
158-
delete the previous deployment and then install the latest. **HOWEVER**:
159-
You *must not delete* the deployment of the custom resource definitions
160-
(CRDs), or your ArangoDB deployments will be deleted!
161-
162-
Therefore, you have to use `helm list` to find the deployments for the
163-
operator (`kube-arangodb`) and of the storage operator
164-
(`kube-arangodb-storage`) and use `helm delete` to delete them using the
165-
automatically generated deployment names. Here is an example of a `helm
166-
list` output:
167-
168-
```
169-
% helm list
170-
NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE
171-
vetoed-ladybird 1 Mon Apr 8 11:36:58 2019 DEPLOYED kube-arangodb-0.3.10-preview default
172-
```
173-
174-
So here, you would have to do
175-
176-
```bash
177-
helm delete vetoed-ladybird
178-
```
179-
180-
but **not delete `steely-mule`**. Then you could install the new version
181-
with `helm install` as normal:
182-
183-
```bash
184-
# The following will install the operator for `ArangoDeployment` &
185-
# `ArangoDeploymentReplication` resources.
186-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz
187-
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
188-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.features.storage=true"
189-
```
190-
191-
## Operator Enterprise Edition (EE)
192-
193-
Image: `arangodb/kube-arangodb-enterprise:1.2.34`
194-
195-
### Installation of latest EE release using Kubectl
196-
126+
##### Enterprise Edition
197127
```bash
198128
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/enterprise-crd.yaml
199129
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/enterprise-deployment.yaml
@@ -203,75 +133,93 @@ kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34
203133
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/1.2.34/manifests/enterprise-deployment-replication.yaml
204134
```
205135

206-
This procedure can also be used for upgrades and will not harm any
207-
running ArangoDB deployments.
208-
209-
### Installation of latest EE release using kustomize
136+
### Installation of latest release using kustomize
210137

211138
Installation using [kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/) looks like installation from yaml files,
212139
but user is allowed to modify namespace or resource names without yaml modifications.
213140

214-
IT is recommended to use kustomization instead of handcrafting namespace in yaml files - kustomization will replace not only resource namespaces,
141+
It is recommended to use kustomization instead of handcrafting namespace in yaml files - kustomization will replace not only resource namespaces,
215142
but also namespace references in resources like ClusterRoleBinding.
216143

217-
Example kustomization file:
144+
See `manifests/kustomize` directory for available combinations of installed features.
145+
146+
##### Community Edition example
218147
```
219148
apiVersion: kustomize.config.k8s.io/v1beta1
220149
kind: Kustomization
221-
222150
namespace: my-custom-namespace
151+
resources:
152+
- https://github.com/arangodb/kube-arangodb/manifests/kustomize/crd?ref=1.2.34
153+
- https://github.com/arangodb/kube-arangodb/manifests/kustomize/deployment?ref=1.2.34
154+
```
223155

224-
bases:
225-
- https://github.com/arangodb/kube-arangodb/manifests/kustomize-enterprise/deployment/?ref=1.0.3
156+
##### Enterprise Edition example
157+
```
158+
apiVersion: kustomize.config.k8s.io/v1beta1
159+
kind: Kustomization
160+
namespace: my-custom-namespace
161+
resources:
162+
- https://github.com/arangodb/kube-arangodb/manifests/kustomize-enterprise/crd?ref=1.2.34
163+
- https://github.com/arangodb/kube-arangodb/manifests/kustomize-enterprise/deployment?ref=1.2.34
226164
```
227165

228-
### Installation of latest EE release using Helm
166+
### Installation of latest release using Helm
167+
168+
Only use this procedure for clean installation of the operator. For upgrades see next section
229169

230-
Only use this procedure for a new install of the operator. See below for
231-
upgrades.
170+
##### Community Edition
171+
```bash
172+
# The following will install the operator and basic CRDs resources.
173+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz
174+
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
175+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.features.storage=true"
176+
```
232177

178+
##### Enterprise Edition
233179
```bash
234-
# The following will install the operator for `ArangoDeployment` &
235-
# `ArangoDeploymentReplication` resources.
236-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34"
180+
# The following will install the operator and basic CRDs resources.
181+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34"
237182
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
238-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34" --set "operator.features.storage=true"
183+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34" --set "operator.features.storage=true"
239184
```
240185

241186
### Upgrading the operator using Helm
242187

243188
To upgrade the operator to the latest version with Helm, you have to
244-
delete the previous deployment and then install the latest. **HOWEVER**:
245-
You *must not delete* the deployment of the custom resource definitions
246-
(CRDs), or your ArangoDB deployments will be deleted!
189+
delete the previous operator deployment and then install the latest. **HOWEVER**:
190+
You *must not delete* the custom resource definitions (CRDs),
191+
or your ArangoDB deployments will be deleted!
247192

248193
Therefore, you have to use `helm list` to find the deployments for the
249-
operator (`kube-arangodb`) and of the storage operator
250-
(`kube-arangodb-storage`) and use `helm delete` to delete them using the
251-
automatically generated deployment names. Here is an example of a `helm
252-
list` output:
194+
operator (`kube-arangodb`) and use `helm delete` to delete them using the
195+
automatically generated deployment names. Here is an example of a `helm list` output:
253196

254197
```
255-
% helm list
256-
NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE
257-
vetoed-ladybird 1 Mon Apr 8 11:36:58 2019 DEPLOYED kube-arangodb-0.3.10-preview default
198+
NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION
199+
kube-arangodb-1-1696919877 default 1 2023-10-10 08:37:57.884783199 +0200 CEST deployed kube-arangodb-1.2.31
258200
```
259201

260202
So here, you would have to do
261-
262203
```bash
263-
helm delete vetoed-ladybird
204+
helm delete kube-arangodb-1-1696919877
264205
```
265206

266-
but **not delete `steely-mule`**. Then you could install the new version
267-
with `helm install` as normal:
207+
Then you can install the new version with `helm install` as normal:
208+
209+
##### Community Edition
210+
```bash
211+
# The following will install the operator and basic CRDs resources.
212+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz
213+
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
214+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.features.storage=true"
215+
```
268216

217+
##### Enterprise Edition
269218
```bash
270-
# The following will install the operator for `ArangoDeployment` &
271-
# `ArangoDeploymentReplication` resources.
272-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34"
219+
# The following will install the operator and basic CRDs resources.
220+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34"
273221
# To use `ArangoLocalStorage`, set field `operator.features.storage` to true
274-
helm install https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34" --set "operator.features.storage=true"
222+
helm install --generate-name https://github.com/arangodb/kube-arangodb/releases/download/1.2.34/kube-arangodb-1.2.34.tgz --set "operator.image=arangodb/kube-arangodb-enterprise:1.2.34" --set "operator.features.storage=true"
275223
```
276224

277225
## Building

0 commit comments

Comments
 (0)