diff --git a/revad/Chart.yaml b/revad/Chart.yaml index 99b45f3..f1d3518 100644 --- a/revad/Chart.yaml +++ b/revad/Chart.yaml @@ -2,12 +2,19 @@ apiVersion: v2 name: revad description: The Reva daemon (revad) helm chart type: application -version: 1.2.2 -appVersion: v1.5.1 +version: 1.2.3 +appVersion: v1.7.0 icon: https://reva.link/logo.svg home: https://reva.link sources: - https://github.com/cs3org/reva +maintainers: + - name: SamuAlfageme + email: samuel.alfageme.sainz@cern.ch + - name: labkode + email: hugo.gonzalez.labrador@cern.ch + - name: ishank011 + email: ishank.arora@cern.ch keywords: - iop - cs3apis @@ -15,7 +22,9 @@ keywords: - sync-and-share annotations: artifacthub.io/changes: | - - Add chart metadata for artifacthub.io integration + - Enable group support by default, providing some placeholder groups + - Inject an empty 'ocm-providers.json' to prevent revad from crashing at startup + - Add maintainters to the chart artifacthub.io/images: | - name: revad image: cs3org/revad:latest diff --git a/revad/README.md b/revad/README.md index e6f1e9d..0ba978d 100644 --- a/revad/README.md +++ b/revad/README.md @@ -29,32 +29,34 @@ $ helm delete my-reva The following configurations may be set. It is recommended to use `values.yaml` for overwriting the revad config. -| Parameter | Description | Default | -| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------- | -| `replicaCount` | How many replicas to run. | `1` | -| `image.repository` | Name of the image to run, without the tag. | [`cs3org/revad`](https://hub.docker.com/r/cs3org/revad) | -| `image.tag` | The image tag to use. | `latest` | -| `image.pullPolicy` | The kubernetes image pull policy. | `Always` | -| `service.type` | The kubernetes service type to use. | `ClusterIP` | -| `service.grpc.port` | Revad's GRPC Service port. To be set on the `address` under the `[grpc]` section of the config. | `19000`. Can be explicitly disabled by setting `service.grpc` to `null`. | -| `service.http.port` | Revad's HTTP Service port. To be set on the `address` under the `[http]` section of the config. | `19001`. Can be explicitly disabled by setting `service.http` to `null`. | -| `extraVolumeMounts` | Array of additional volume mounts. | `[]` | -| `extraVolumes` | Array of additional volumes. | `[]` | -| `emptyDir.sizeLimit` | `emptyDir` `sizeLimit` if a Persistent Volume is not used | `""` | -| `persistentVolume.enabled` | If true, Revad will create a Persistent Volume Claim. | `false` | -| `persistentVolume.accessModes` | Revad data Persistent Volume access modes. | `[ReadWriteOnce]` | -| `persistentVolume.annotations` | Revad data Persistent Volume annotations. | `{}` | -| `persistentVolume.existingClaim` | Revad data pre-existing Persistent Volume Claim's name. | `""` | -| `persistentVolume.mountPath` | Revad data Persistent Volume mount root path. To be set as the `storage` service `root`. | `/var/tmp/reva` | -| `persistentVolume.subPath` | Subdirectory of the Persistent Volume to mount as Revad's datadir. | `""` | -| `persistentVolume.size` | Revad data Persistent Volume size. | `2Gi` | -| `persistentVolume.storageClass` | [PVC Storage Class](https://kubernetes.io/docs/concepts/storage/storage-classes/#the-storageclass-resource). | `unset` | -| `persistentVolume.volumeBindingMode` | [PVC Binding Mode](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode). | `unset` | -| `env` | Dictionary of environment variables passed to the container in `NAME:value` form. | `{}` | -| `extraEnv` | List of environment variables passed to the container in pod field (`name` and `value`/`valueFrom`) form. | `[]` | -| `envFrom` | List of sources (ConfigMap/Secret) to populate environment variables in the container. | `[]` | -| `configFiles.revad\\.toml` | Revad [config file](https://reva.link/docs/config/). Mounted on `/etc/revad/`. | [`examples/standalone/standalone.toml`](https://github.com/cs3org/reva/blob/master/examples/standalone/standalone.toml) | -| `configFiles.users\\.json` | Revad `users.json` for the `auth_manager` and `userprovider` services. Mounted on `/etc/revad/`. | [`examples/standalone/users.demo.json`](https://github.com/cs3org/reva/blob/master/examples/standalone/users.demo.json) | +| Parameter | Description | Default | +| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------- | +| `replicaCount` | How many replicas to run. | `1` | +| `image.repository` | Name of the image to run, without the tag. | [`cs3org/revad`](https://hub.docker.com/r/cs3org/revad) | +| `image.tag` | The image tag to use. | `latest` | +| `image.pullPolicy` | The kubernetes image pull policy. | `Always` | +| `service.type` | The kubernetes service type to use. | `ClusterIP` | +| `service.grpc.port` | Revad's GRPC Service port. To be set on the `address` under the `[grpc]` section of the config. | `19000`. Can be explicitly disabled by setting `service.grpc` to `null`. | +| `service.http.port` | Revad's HTTP Service port. To be set on the `address` under the `[http]` section of the config. | `19001`. Can be explicitly disabled by setting `service.http` to `null`. | +| `extraVolumeMounts` | Array of additional volume mounts. | `[]` | +| `extraVolumes` | Array of additional volumes. | `[]` | +| `emptyDir.sizeLimit` | `emptyDir` `sizeLimit` if a Persistent Volume is not used | `""` | +| `persistentVolume.enabled` | If true, Revad will create a Persistent Volume Claim. | `false` | +| `persistentVolume.accessModes` | Revad data Persistent Volume access modes. | `[ReadWriteOnce]` | +| `persistentVolume.annotations` | Revad data Persistent Volume annotations. | `{}` | +| `persistentVolume.existingClaim` | Revad data pre-existing Persistent Volume Claim's name. | `""` | +| `persistentVolume.mountPath` | Revad data Persistent Volume mount root path. To be set as the `storage` service `root`. | `/var/tmp/reva` | +| `persistentVolume.subPath` | Subdirectory of the Persistent Volume to mount as Revad's datadir. | `""` | +| `persistentVolume.size` | Revad data Persistent Volume size. | `2Gi` | +| `persistentVolume.storageClass` | [PVC Storage Class](https://kubernetes.io/docs/concepts/storage/storage-classes/#the-storageclass-resource). | `unset` | +| `persistentVolume.volumeBindingMode` | [PVC Binding Mode](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode). | `unset` | +| `env` | Dictionary of environment variables passed to the container in `NAME:value` form. | `{}` | +| `extraEnv` | List of environment variables passed to the container in pod field (`name` and `value`/`valueFrom`) form. | `[]` | +| `envFrom` | List of sources (ConfigMap/Secret) to populate environment variables in the container. | `[]` | +| `configFiles.revad\\.toml` | Revad [config file](https://reva.link/docs/config/). Mounted on `/etc/revad/`. | [`examples/standalone/standalone.toml`](https://github.com/cs3org/reva/blob/master/examples/standalone/standalone.toml) | +| `configFiles.users\\.json` | Revad `users.json` for the `auth_manager` and `userprovider` services. Mounted on `/etc/revad/`. | [`examples/standalone/users.demo.json`](https://github.com/cs3org/reva/blob/master/examples/standalone/users.demo.json) | +| `configFiles.groups\\.json` | Revad `groups.json` for the `groupprovider` service. Mounted on `/etc/revad/`. | [`examples/standalone/groups.demo.json`](https://github.com/cs3org/reva/blob/master/examples/standalone/groups.demo.json) | +| `configFiles.ocm-providers\\.json` | Revad `ocm-providers.json` for the `ocmproviderauthorizer` service. Mounted on `/etc/revad/`. | `[]` | > **Note:** `service.grpc` and `service.http` can't be both `null`. diff --git a/revad/values.yaml b/revad/values.yaml index 28ab7ff..4a19d11 100644 --- a/revad/values.yaml +++ b/revad/values.yaml @@ -78,6 +78,7 @@ configFiles: [grpc.services.authprovider] [grpc.services.authregistry] [grpc.services.userprovider] + [grpc.services.groupprovider] [grpc.services.usershareprovider] [grpc.services.publicshareprovider] [grpc.services.ocmcore] @@ -90,6 +91,7 @@ configFiles: [http.services.prometheus] [http.services.ocmd] [http.services.ocdav] + [http.services.ocs] users.json: | [ @@ -127,3 +129,148 @@ configFiles: "groups": ["quantum-lovers", "philosophy-haters", "physics-lovers"] } ] + + groups.json: | + [ + { + "id": { + "opaque_id": "sailing-lovers", + "idp": "localhost:19000" + }, + "group_name": "sailing-lovers", + "mail": "sailing-lovers@example.org", + "display_name": "Sailing Lovers", + "gid_number": 123, + "members": [ + { + "id": { + "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "violin-haters", + "idp": "localhost:19000" + }, + "group_name": "violin-haters", + "mail": "violin-haters@example.org", + "display_name": "Violin Haters", + "gid_number": 456, + "members": [ + { + "id": { + "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "radium-lovers", + "idp": "localhost:19000" + }, + "group_name": "radium-lovers", + "mail": "radium-lovers@example.org", + "display_name": "Radium Lovers", + "gid_number": 789, + "members": [ + { + "id": { + "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "polonium-lovers", + "idp": "localhost:19000" + }, + "group_name": "polonium-lovers", + "mail": "polonium-lovers@example.org", + "display_name": "Polonium Lovers", + "gid_number": 987, + "members": [ + { + "id": { + "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "quantum-lovers", + "idp": "localhost:19000" + }, + "group_name": "quantum-lovers", + "mail": "quantum-lovers@example.org", + "display_name": "Quantum Lovers", + "gid_number": 654, + "members": [ + { + "id": { + "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "philosophy-haters", + "idp": "localhost:19000" + }, + "group_name": "philosophy-haters", + "mail": "philosophy-haters@example.org", + "display_name": "Philosophy Haters", + "gid_number": 321, + "members": [ + { + "id": { + "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c", + "idp": "localhost:19000" + } + } + ] + }, + { + "id": { + "opaque_id": "physics-lovers", + "idp": "localhost:19000" + }, + "group_name": "physics-lovers", + "mail": "physics-lovers@example.org", + "display_name": "Physics Lovers", + "gid_number": 101, + "members": [ + { + "id": { + "opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51", + "idp": "localhost:19000" + } + }, + { + "id": { + "opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", + "idp": "localhost:19000" + } + }, + { + "id": { + "opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c", + "idp": "localhost:19000" + } + } + ] + } + ] + + ocm-providers.json: | + []