Skip to content

Commit ec1d0a5

Browse files
ewoutpewoutp
authored
Merge pull request #255 from arangodb/bugfix/crd-helm
Include CRD in helm chart
2 parents d3ccc4f + 653ffc1 commit ec1d0a5

File tree

10 files changed

+49
-58
lines changed

10 files changed

+49
-58
lines changed

‎Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ ifneq ($(DEPLOYMENTNAMESPACE), default)
299299
$(ROOTDIR)/scripts/kube_delete_namespace.sh $(DEPLOYMENTNAMESPACE)
300300
kubectl create namespace $(DEPLOYMENTNAMESPACE)
301301
endif
302-
kubectl apply -f manifests/crd.yaml
303302
kubectl apply -f $(MANIFESTPATHSTORAGE)
304303
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
305304
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
@@ -407,7 +406,6 @@ delete-operator:
407406

408407
.PHONY: redeploy-operator
409408
redeploy-operator: delete-operator manifests
410-
kubectl apply -f manifests/crd.yaml
411409
kubectl apply -f $(MANIFESTPATHSTORAGE)
412410
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
413411
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/0.3.0/
6161

6262
```bash
6363
DOCKERNAMESPACE=<your dockerhub account> make
64-
kubectl apply -f manifests/crd.yaml
6564
kubectl apply -f manifests/arango-deployment-dev.yaml
6665
# To use `ArangoLocalStorage`, also run
6766
kubectl apply -f manifests/arango-storage-dev.yaml

‎docs/Manual/Deployment/Kubernetes/Usage.md

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ run (replace `<version>` with the version of the operator that you want to insta
4040

4141
```bash
4242
export URLPREFIX=https://raw.githubusercontent.com/arangodb/kube-arangodb/<version>/manifests
43-
kubectl apply -f $URLPREFIX/crd.yaml
4443
kubectl apply -f $URLPREFIX/arango-deployment.yaml
4544
```
4645

‎docs/Manual/Tutorials/Kubernetes/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ For now, any recent Kubernetes cluster will do (e.g. `minikube`).
3737
Then run (replace `<version>` with the version of the operator that you want to install):
3838

3939
```bash
40-
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/<version>/manifests/crd.yaml
4140
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/<version>/manifests/arango-deployment.yaml
4241
# Optional
4342
kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/<version>/manifests/arango-storage.yaml

‎manifests/crd.yaml

-52
This file was deleted.

‎manifests/templates/deployment-replication/crd.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: arangodeploymentreplications.replication.database.arangodb.com
5+
spec:
6+
group: replication.database.arangodb.com
7+
names:
8+
kind: ArangoDeploymentReplication
9+
listKind: ArangoDeploymentReplicationList
10+
plural: arangodeploymentreplications
11+
shortNames:
12+
- arangorepl
13+
singular: arangodeploymentreplication
14+
scope: Namespaced
15+
version: v1alpha

‎manifests/templates/deployment/crd.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: arangodeployments.database.arangodb.com
5+
spec:
6+
group: database.arangodb.com
7+
names:
8+
kind: ArangoDeployment
9+
listKind: ArangoDeploymentList
10+
plural: arangodeployments
11+
shortNames:
12+
- arangodb
13+
- arango
14+
singular: arangodeployment
15+
scope: Namespaced
16+
version: v1alpha

‎manifests/templates/storage/crd.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: arangolocalstorages.storage.arangodb.com
5+
spec:
6+
group: storage.arangodb.com
7+
names:
8+
kind: ArangoLocalStorage
9+
listKind: ArangoLocalStorageList
10+
plural: arangolocalstorages
11+
shortNames:
12+
- arangostorage
13+
singular: arangolocalstorage
14+
scope: Cluster
15+
version: v1alpha

‎scripts/patch_readme.sh

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if [ -z $VERSION ]; then
1111
fi
1212

1313
f=README.md
14-
sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/crd.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/crd.yaml@g" -i "" $f
1514
sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment.yaml@g" -i "" $f
1615
sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-deployment-replication.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-deployment-replication.yaml@g" -i "" $f
1716
sed -e "s@^kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/.*/manifests/arango-storage.yaml\$@kubectl apply -f https://raw.githubusercontent.com/arangodb/kube-arangodb/${VERSION}/manifests/arango-storage.yaml@g" -i "" $f

‎tools/manifests/manifest_builder.go

+3
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,19 @@ var (
5656
AllowChaos bool
5757
}
5858
deploymentTemplateNames = []Template{
59+
Template{Name: "crd.yaml"},
5960
Template{Name: "rbac.yaml", Predicate: hasRBAC},
6061
Template{Name: "deployment.yaml"},
6162
Template{Name: "service.yaml"},
6263
}
6364
deploymentReplicationTemplateNames = []Template{
65+
Template{Name: "crd.yaml"},
6466
Template{Name: "rbac.yaml", Predicate: hasRBAC},
6567
Template{Name: "deployment-replication.yaml"},
6668
Template{Name: "service.yaml"},
6769
}
6870
storageTemplateNames = []Template{
71+
Template{Name: "crd.yaml"},
6972
Template{Name: "rbac.yaml", Predicate: hasRBAC},
7073
Template{Name: "deployment.yaml"},
7174
Template{Name: "service.yaml"},

0 commit comments

Comments
 (0)