Skip to content

Commit

Permalink
NOISSUE - Add Group-based Access Control to charts and update depende…
Browse files Browse the repository at this point in the history
…ncies version (#127)

* Update dependencies (this alone does not enable a working release with current (>=1.25) kubernetes

Signed-off-by: Kibahop <[email protected]>

update: charts dependencies

Signed-off-by: Arvindh <[email protected]>

update: charts dependencies

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

update: charts dependencies

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

update: charts to MF-1506 - Group-based Access Control

Signed-off-by: Arvindh <[email protected]>

* update: documentation

Signed-off-by: Arvindh <[email protected]>

* rename from mainflux to magistrala

Signed-off-by: Arvindh <[email protected]>

* restore auth

Signed-off-by: Arvindh <[email protected]>

* rename MF to MG

Signed-off-by: Arvindh <[email protected]>

* rename mf to mg

Signed-off-by: Arvindh <[email protected]>

* fix license header

Signed-off-by: Arvindh <[email protected]>

* fix auth template

Signed-off-by: Arvindh <[email protected]>

* modified helm charts

Signed-off-by: Arvindh <[email protected]>

* fixes and added services

Signed-off-by: Arvindh <[email protected]>

* add vault

Signed-off-by: Arvindh <[email protected]>

* add ingress nginx spec

Signed-off-by: Arvindh <[email protected]>

* add ingress nginx spec

Signed-off-by: Arvindh <[email protected]>

* Remove .env data

Signed-off-by: Arvindh <[email protected]>

* ignore .env data

Signed-off-by: Arvindh <[email protected]>

* fix nginx route

Signed-off-by: Arvindh <[email protected]>

* fix charts

Signed-off-by: Arvindh <[email protected]>

* fix charts

Signed-off-by: Arvindh <[email protected]>

* chore: Update helm chart values for Mainflux

Signed-off-by: JeffMboya <[email protected]>

* Update copyright information in timescale-reader-deployment.yaml and timescale-writer-deployment.yaml

Signed-off-by: JeffMboya <[email protected]>

* Update README

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional coap-adapter values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional http-adapter values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional mqtt-adapter values

Signed-off-by: JeffMboya <[email protected]>

* feat: Add explanations for optional configuration parameters in adapter_coap section

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional spicedb values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional auth values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional users values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional users values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional bootstrap values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional certs values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional invitations values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional journal values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional timescaledb values

Signed-off-by: JeffMboya <[email protected]>

* chore: add optional ui values

Signed-off-by: JeffMboya <[email protected]>

* update values

Signed-off-by: Arvindh <[email protected]>

---------

Signed-off-by: Arvindh <[email protected]>
Signed-off-by: JeffMboya <[email protected]>
Co-authored-by: Kibahop <[email protected]>
Co-authored-by: JeffMboya <[email protected]>
  • Loading branch information
3 people authored Aug 27, 2024
1 parent 19ca0c6 commit 9815a30
Show file tree
Hide file tree
Showing 91 changed files with 3,093 additions and 2,453 deletions.
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Pull request title should be `MF-XXX - description` or `NOISSUE - description` where XXX is ID of issue that this PR relate to.
Please review the [CONTRIBUTING.md](https://github.com/mainflux/mainflux/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.
Pull request title should be `MG-XXX - description` or `NOISSUE - description` where XXX is ID of issue that this PR relate to.
Please review the [CONTRIBUTING.md](https://github.com/absmach/magistrala/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.

### What does this do?

Expand All @@ -12,4 +12,4 @@ Put here `Resolves #XXX` to auto-close the issue that your PR fixes (if such)

### Did you document any new/modified functionality?

### Notes
### Notes
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

END OF TERMS AND CONDITIONS

Copyright 2015-2019 Mainflux
Copyright 2015-2019 Magistrala

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
## DevOps
DevOps scripts for Mainflux IoT platform.

DevOps scripts for Magistrala IoT platform.

## Install

Follow the instructions in [`charts`](charts) directory.

Detailed documentation can be found [here](https://mainflux.readthedocs.io/en/latest/kubernetes/).
Detailed documentation can be found [here](https://docs.magistrala.abstractmachines.fr/kubernetes/).

## License

[Apace-2.0](LICENSE)
60 changes: 27 additions & 33 deletions charts/mainflux/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,51 +1,45 @@
dependencies:
- name: nats
repository: https://charts.helm.sh/stable
version: 4.3.7
repository: https://nats-io.github.io/k8s/helm/charts/
version: 1.2.1
- name: jaeger
repository: https://jaegertracing.github.io/helm-charts
version: 3.1.1
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 12.6.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 12.6.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 12.6.2
- name: redis
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 12.6.2
- name: redis
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 12.6.2
- name: influxdb
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 1.1.9
- name: mongodb
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.4.1
version: 12.5.6
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.2.3
- name: loki-stack
repository: https://grafana.github.io/helm-charts
version: 2.5.0
- name: keto
repository: https://k8s.ory.sh/helm/charts
version: 0.21.7
digest: sha256:d1d5b2bd36185bf632d5a08bf9f26495d93781d8c3ec335066afc4cc8cd6b9f6
generated: "2022-02-07T17:15:53.130234981+01:00"
version: 12.5.6
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 19.6.2
- name: vault
repository: https://helm.releases.hashicorp.com
version: 0.28.1
digest: sha256:9b98511c690b0f1f61f58130390537b9b02727bd1f190d6e334ef9c60d0bc82c
generated: "2024-08-01T23:25:55.078828535+05:30"
125 changes: 64 additions & 61 deletions charts/mainflux/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,96 +1,99 @@
# Copyright (c) Mainflux
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

apiVersion: v2
name: mainflux
description: Mainflux IoT Platform
name: magistrala
description: Magistrala IoT Platform
icon: https://avatars1.githubusercontent.com/u/13207490
type: application
version: 1.0.3
appVersion: "0.12.1"
home: https://www.mainflux.com
home: https://abstractmachines.fr/magistrala.html
sources:
- https://hub.docker.com/u/mainflux/
- https://hub.docker.com/u/magistrala
maintainers:
- name: blokovi
email: [email protected]
- name: isavcic
email: [email protected]
- name: drasko
email: [email protected]
- name: dusan
email: [email protected]

dependencies:
- name: nats
version: "4.3.7"
repository: "@stable"
version: "1.2.1"
repository: "@nats"

- name: jaeger
version: "3.1.1"
repository: "@jaegertracing"

- name: postgresql
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlauth
condition: postgresqlauth.enabled

- name: postgresql
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlspicedb
condition: postgresqlspicedb.enabled

- name: postgresql
version: "10.2.3"
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlthings
condition: postgresqlthings.enabled

- name: postgresql
version: "10.2.3"
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlusers
condition: postgresqlusers.enabled


- name: postgresql
version: "10.2.3"
repository: "@bitnami"
alias: postgresqlauth
condition: postgresqlauth.enabled
- name: postgresql
version: "10.2.3"
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlbootstrap
condition: postgresqlbootstrap.enabled

- name: postgresql
version: "10.2.3"
version: "12.5.6"
repository: "@bitnami"
alias: postgresqlcerts
condition: postgresqlcerts.enabled

- name: postgresql
version: "10.2.3"
repository: "@bitnami"
alias: postgresqlketo
condition: postgresqlketo.enabled
- name: redis
version: "12.6.2"
version: "12.5.6"
repository: "@bitnami"
alias: redis-streams
- name: redis
version: "12.6.2"
alias: postgresqlinvitations
condition: postgresqlinvitations.enabled

- name: postgresql
version: "12.5.6"
repository: "@bitnami"
alias: redis-auth
- name: redis
version: "12.6.2"
alias: postgresqljournal
condition: postgresqljournal.enabled

- name: postgresql
version: "12.5.6"
repository: "@bitnami"
alias: redis-mqtt
- name: redis
version: "12.6.2"
alias: timescaledb
condition: timescaledb.enabled

- name: postgresql
version: "12.5.6"
repository: "@bitnami"
alias: redis-opcua
condition: adapter_opcua.enabled
alias: postgresqlui
condition: postgresqlui.enabled

- name: redis
version: "12.6.2"
repository: "@bitnami"
alias: redis-lora
condition: adapter_lora.enabled
- name: influxdb
version: "1.1.9"
version: "19.6.2"
repository: "@bitnami"
condition: influxdb.enabled
- name: mongodb
version: "10.4.1"
repository: "@bitnami"
alias: twins-db
condition: twins.enabled
- name: postgresql
version: "10.2.3"
repository: "@bitnami"
alias: postgresqlnotifiersmtp
condition: postgresqlnotifiersmtp.enabled
- name: loki-stack
version: "2.5.0"
repository: "@grafana"
condition: loki-stack.enabled
- name: keto
version: "0.21.7"
repository: "@ory"
alias: redis-things

- name: vault
version: "0.28.1"
repository: "@hashicorp"
alias: "vault"
condition: vault.enabled
Loading

0 comments on commit 9815a30

Please sign in to comment.