Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[frinx-machine] Make tag based deployment #421

Merged
merged 1 commit into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 50 additions & 7 deletions charts/frinx-machine/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,101 +12,144 @@ appVersion: 6.1.1
maintainers:
- name: FRINX
dependencies:

# Operators
- name: frinx-machine-operators
repository: https://FRINXio.github.io/helm-charts
version: 0.3.0
condition: frinx-machine-operators.enabled
tags:
- operators

# Monitoring

- name: frinx-machine-monitoring
repository: https://FRINXio.github.io/helm-charts
version: 0.1.0
version: 0.1.1
condition: frinx-machine-monitoring.enabled

# Frinx Machine Core
tags:
- monitoring

## Databases
- name: cloud-native-pg
alias: workflow-manager-postgres
repository: https://FRINXio.github.io/helm-charts
version: 0.1.0
condition: workflow-manager-postgres.enabled
tags:
- database

- name: cloud-native-pg
alias: uniconfig-postgres
repository: https://FRINXio.github.io/helm-charts
version: 0.1.0
condition: uniconfig-postgres.enabled
tags:
- database

- name: frinx-arango-config
repository: https://FRINXio.github.io/helm-charts
version: 4.2.0
condition: frinx-arango-config.enabled
tags:
- database

- name: kafka
repository: https://charts.bitnami.com/bitnami
version: 25.2.0
condition: kafka.enabled
tags:
- database

- name: postgresql
alias: timescale-db
repository: https://charts.bitnami.com/bitnami
version: 11.x.x
condition: timescale-db.enabled
tags:
- database

## Services
- name: krakend
repository: https://FRINXio.github.io/helm-charts
version: 5.0.1
condition: krakend.enabled
tags:
- backend

- name: frinx-frontend
repository: https://FRINXio.github.io/helm-charts
version: 4.1.0
condition: frinx-frontend.enabled
tags:
- backend

- name: resource-manager
repository: https://FRINXio.github.io/helm-charts
version: 2.3.1
condition: resource-manager.enabled
tags:
- backend

- name: workflow-manager
repository: https://FRINXio.github.io/helm-charts
version: 3.2.1
condition: workflow-manager.enabled
tags:
- backend

- name: inventory
repository: https://FRINXio.github.io/helm-charts
version: 6.0.2
condition: inventory.enabled
tags:
- backend

- name: traefik
alias: uc-zone-lb
repository: https://traefik.github.io/charts
version: 27.0.2
condition: uc-zone-lb.enabled
tags:
- backend

- name: uniconfig
repository: https://FRINXio.github.io/helm-charts
version: 8.2.1
condition: uniconfig.enabled
tags:
- backend

- name: topology-discovery
repository: https://FRINXio.github.io/helm-charts
version: 3.1.0
version: 3.1.1
condition: topology-discovery.enabled
tags:
- backend

- name: performance-monitor
repository: https://FRINXio.github.io/helm-charts
version: 0.1.3
version: 0.1.5
condition: performance-monitor.enabled
tags:
- backend

- name: swagger-ui
repository: https://FRINXio.github.io/helm-charts
version: 0.1.1
version: 0.2.0
condition: swagger-ui.enabled
tags:
- backend

- name: worker
alias: device-induction
repository: https://FRINXio.github.io/helm-charts
version: 4.0.0
version: 4.1.0
condition: device-induction.enabled
tags:
- backend

# Optional

- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
Expand Down
32 changes: 14 additions & 18 deletions charts/frinx-machine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ User specific workflows are designed through the use of OpenConfig NETCONF & YAN
The FRINX Machine uses dockerized containers that are designed and tested to work together to create a user specific solution.
Further information is available on [docs.frinx.io](https://docs.frinx.io/frinx-machine/getting-started/).

![Version: 9.0.1](https://img.shields.io/badge/Version-9.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)
![Version: 10.0.0](https://img.shields.io/badge/Version-10.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.1](https://img.shields.io/badge/AppVersion-6.1.1-informational?style=flat-square)

## Prerequisites

Expand Down Expand Up @@ -73,27 +73,23 @@ Frinx Machine can be deployed with Oauth2-Proxy. Example of configuration can be

| Repository | Name | Version |
|------------|------|---------|
| https://FRINXio.github.io/helm-charts | workflow-manager-postgres(cloud-native-pg) | 0.0.2 |
| https://FRINXio.github.io/helm-charts | uniconfig-postgres(cloud-native-pg) | 0.0.2 |
| https://FRINXio.github.io/helm-charts | uniconfig-postgres(cloud-native-pg) | 0.1.0 |
| https://FRINXio.github.io/helm-charts | workflow-manager-postgres(cloud-native-pg) | 0.1.0 |
| https://FRINXio.github.io/helm-charts | frinx-arango-config | 4.2.0 |
| https://FRINXio.github.io/helm-charts | frinx-frontend | 4.1.0 |
| https://FRINXio.github.io/helm-charts | frinx-grafana-configs | 1.x.x |
| https://FRINXio.github.io/helm-charts | inventory | 6.0.0 |
| https://FRINXio.github.io/helm-charts | krakend | 4.0.0 |
| https://FRINXio.github.io/helm-charts | performance-monitor | 0.1.3 |
| https://FRINXio.github.io/helm-charts | resource-manager | 2.1.0 |
| https://FRINXio.github.io/helm-charts | swagger-ui | 0.1.1 |
| https://FRINXio.github.io/helm-charts | topology-discovery | 3.1.0 |
| https://FRINXio.github.io/helm-charts | uniconfig | 8.0.0 |
| https://FRINXio.github.io/helm-charts | device-induction(worker) | 4.0.0 |
| https://FRINXio.github.io/helm-charts | workflow-manager | 3.1.1 |
| https://FRINXio.github.io/helm-charts | frinx-machine-monitoring | 0.1.1 |
| https://FRINXio.github.io/helm-charts | frinx-machine-operators | 0.3.0 |
| https://FRINXio.github.io/helm-charts | inventory | 6.0.2 |
| https://FRINXio.github.io/helm-charts | krakend | 5.0.1 |
| https://FRINXio.github.io/helm-charts | performance-monitor | 0.1.5 |
| https://FRINXio.github.io/helm-charts | resource-manager | 2.3.1 |
| https://FRINXio.github.io/helm-charts | swagger-ui | 0.2.0 |
| https://FRINXio.github.io/helm-charts | topology-discovery | 3.1.1 |
| https://FRINXio.github.io/helm-charts | uniconfig | 8.2.1 |
| https://FRINXio.github.io/helm-charts | device-induction(worker) | 4.1.0 |
| https://FRINXio.github.io/helm-charts | workflow-manager | 3.2.1 |
| https://charts.bitnami.com/bitnami | kafka | 25.2.0 |
| https://charts.bitnami.com/bitnami | timescale-db(postgresql) | 11.x.x |
| https://grafana.github.io/helm-charts | grafana | 7.3.1 |
| https://grafana.github.io/helm-charts | loki | 2.16.0 |
| https://grafana.github.io/helm-charts | promtail | 6.15.5 |
| https://helm.influxdata.com | influxdb2 | 2.1.2 |
| https://helm.influxdata.com | telegraf-ds | 1.1.24 |
| https://oauth2-proxy.github.io/manifests | oauth2-proxy | 7.7.4 |
| https://traefik.github.io/charts | uc-zone-lb(traefik) | 27.0.2 |

Expand Down
89 changes: 0 additions & 89 deletions charts/frinx-machine/e2e-values.yaml

This file was deleted.

34 changes: 16 additions & 18 deletions charts/frinx-machine/ingress-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,25 @@ krakend:
className: nginx
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-read-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-send-timeout: "12h"
hosts:
- host: krakend.127.0.0.1.nip.io
paths:
- path: "/"
pathType: ImplementationSpecific

nginx:
ingress:
enabled: false
className: nginx
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-read-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-send-timeout: "12h"
hostname: fm.127.0.0.1.nip.io

resource-manager:
ingress:
Expand Down Expand Up @@ -66,9 +76,9 @@ uniconfig:
className: nginx
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-read-timeout: "12h"
nginx.ingress.kubernetes.io/proxy-send-timeout: "12h"
hosts:
- host: uniconfig-controller.127.0.0.1.nip.io
paths:
Expand All @@ -84,15 +94,3 @@ performance-monitor:
paths:
- path: "/"
pathType: ImplementationSpecific

oauth2-proxy:
ingress:
enabled: false
className: nginx
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
hosts:
- "fm.127.0.0.1.nip.io"
Loading
Loading