Skip to content
This repository has been archived by the owner on Oct 20, 2022. It is now read-only.

Commit

Permalink
remove crds from chart and add v1beta1
Browse files Browse the repository at this point in the history
Signed-off-by: erdrix <[email protected]>
  • Loading branch information
erdrix committed Jul 17, 2020
1 parent 186896e commit dae1a7d
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 2,592 deletions.
13 changes: 6 additions & 7 deletions helm/nifikop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ $ helm install --name nifikop orange-incubator/nifikop -f values.yaml

### Installing the Chart

> Helm 3 users
>
> You need to manually install the crds beforehand
>
> ```console
> kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
> ```
You need to manually install the crds beforehand

```console
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nifiusers_crd.yaml
```

You can make a dry run of the chart before deploying :

Expand Down
2,493 changes: 0 additions & 2,493 deletions helm/nifikop/templates/nifi.orange.com_nificlusters_crd.yaml

This file was deleted.

82 changes: 0 additions & 82 deletions helm/nifikop/templates/nifi.orange.com_nifiusers_crd.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions tmp/incubator-index/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,9 @@ entries:
nifikop:
- apiVersion: v1
appVersion: 0.2.0-release
created: 2020-07-17T12:27:10.501039604+02:00
created: 2020-07-17T13:49:32.011611572+02:00
description: A Helm chart for NiFiKop - the Orange NiFi Kubernetes operator
digest: 02c9386a710bb9a862765f5dccc82b66f9a58fabed6b623326ccec162b026fba
digest: 383ae0a388a32f22ae49e293864db6c3cbd960859367dfaa62c736f315db7115
home: https://github.com/Orange-OpenSource/nifikop
keywords:
- operator
Expand Down Expand Up @@ -424,4 +424,4 @@ entries:
urls:
- https://orange-kubernetes-charts-incubator.storage.googleapis.com/tracker-0.0.1.tgz
version: 0.0.1
generated: 2020-07-17T12:27:10.499689423+02:00
generated: 2020-07-17T13:49:32.010726323+02:00
Binary file modified tmp/incubator/nifikop-0.2.0.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,32 @@ external-dns-5d588c6cd6-dw44f 1/1 Running 0 2m58s

Now we have to deploy the `NiFiKop` operator :

Deploy the NiFiKop crds :

<Tabs
defaultValue="k8s16+"
values={[
{ label: 'k8s version 1.16+', value: 'k8s16+', },
{ label: 'k8s previous versions', value: 'k8sprev', },
]
}>
<TabItem value="k8s16+">

```bash
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nifiusers_crd.yaml
```

</TabItem>
<TabItem value="k8sprev">

```bash
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/v1beta1/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/v1beta1/nifi.orange.com_nifiusers_crd.yaml
```
</TabItem>
</Tabs>

```bash
helm repo add orange-incubator https://orange-kubernetes-charts-incubator.storage.googleapis.com/
```
Expand All @@ -178,11 +204,6 @@ helm repo add orange-incubator https://orange-kubernetes-charts-incubator.storag

```bash
# You have to create the namespace before executing following command
kubectl apply -f \
https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f \
https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nifiusers_crd.yaml

helm install nifikop \
--namespace=nifikop \
--set image.tag=v0.2.0-release \
Expand Down
30 changes: 28 additions & 2 deletions website/docs/2_setup/1_getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,34 @@ Alternatively, if you are using Helm, you can deploy the operator using a Helm c

> To install the an other version of the operator use `helm install --name=nifikop --namespace=nifi --set operator.image.tag=x.y.z orange-incubator/nifikop`
Deploy the NiFiKop crds :

<Tabs
defaultValue="k8s16+"
values={[
{ label: 'k8s version 1.16+', value: 'k8s16+', },
{ label: 'k8s previous versions', value: 'k8sprev', },
]
}>
<TabItem value="k8s16+">

```bash
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nifiusers_crd.yaml
```

</TabItem>
<TabItem value="k8sprev">

```bash
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/v1beta1/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/v1beta1/nifi.orange.com_nifiusers_crd.yaml
```
</TabItem>
</Tabs>

Now deploy the helm chart :

```bash
helm repo add orange-incubator https://orange-kubernetes-charts-incubator.storage.googleapis.com/
```
Expand All @@ -147,8 +175,6 @@ helm repo add orange-incubator https://orange-kubernetes-charts-incubator.storag

```bash
# You have to create the namespace before executing following command
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nificlusters_crd.yaml
kubectl apply -f https://raw.githubusercontent.com/Orange-OpenSource/nifikop/master/deploy/crds/nifi.orange.com_nifiusers_crd.yaml
helm install nifikop --namespace=nifi orange-incubator/nifikop
```

Expand Down

0 comments on commit dae1a7d

Please sign in to comment.