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

chore: add vault env vars #35

Merged
merged 7 commits into from
Sep 16, 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
6 changes: 4 additions & 2 deletions charts/datalayer-iam/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Datalayer IAM

![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![AppVersion: 0.1.2](https://img.shields.io/badge/AppVersion-0.1.2-informational?style=flat-square)
![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![AppVersion: 0.1.3](https://img.shields.io/badge/AppVersion-0.1.3-informational?style=flat-square)

## Documentation

Expand Down Expand Up @@ -50,14 +50,16 @@ For full documentation please checkout [Datalayer TECH](https://datalayer.tech/d
| iam.env.DATALAYER_STRIPE_PRODUCT_ID | string | `""` | |
| iam.env.DATALAYER_STRIPE_WEBHOOK_SECRET | string | `""` | |
| iam.env.DATALAYER_SUPPORT_EMAIL | string | `""` | |
| iam.env.DATALAYER_VAULT_TOKEN | string | `""` | |
| iam.env.DATALAYER_VAULT_URL | string | `"http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200"` | |
| iam.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT | string | `""` | |
| iam.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT | string | `""` | |
| iam.env.OTEL_SDK_DISABLED | string | `"false"` | |
| iam.envValueFrom.DATALAYER_SOLR_PASSWORD.secretKeyRef.key | string | `"password"` | |
| iam.envValueFrom.DATALAYER_SOLR_PASSWORD.secretKeyRef.name | string | `"solr-basic-auth"` | |
| iam.envValueFrom.DATALAYER_SOLR_USERNAME.secretKeyRef.key | string | `"username"` | |
| iam.envValueFrom.DATALAYER_SOLR_USERNAME.secretKeyRef.name | string | `"solr-basic-auth"` | |
| iam.image | string | `"datalayer/iam:0.1.1"` | |
| iam.image | string | `"datalayer/iam:0.1.3"` | |
| iam.imagePullPolicy | string | `"Always"` | |
| iam.ingressClass | string | `"datalayer-traefik"` | |
| iam.port | int | `9700` | |
Expand Down
10 changes: 4 additions & 6 deletions charts/datalayer-iam/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,13 @@ tests:
value: ""
- name: DATALAYER_SUPPORT_EMAIL
value: ""
- name: DATALAYER_VAULT_TOKEN
value: ""
- name: DATALAYER_VAULT_URL
value: http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200
- name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
value: ""
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
value: ""
- name: OTEL_SDK_DISABLED
value: "false"
image: datalayer/iam:0.1.1
imagePullPolicy: Always
name: iam
ports:
- containerPort: 9700
protocol: TCP
2 changes: 2 additions & 0 deletions charts/datalayer-iam/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ iam:
DATALAYER_STRIPE_PRODUCT_ID: ""
DATALAYER_STRIPE_WEBHOOK_SECRET: ""
DATALAYER_SUPPORT_EMAIL: ""
DATALAYER_VAULT_TOKEN: ""
DATALAYER_VAULT_URL: "http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200"
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""
OTEL_SDK_DISABLED: "false"
Expand Down
9 changes: 3 additions & 6 deletions charts/datalayer-observer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,12 @@ Datalayer Observer
| kube-prometheus-stack.grafana.dashboardProviders."dashboardproviders.yaml".providers[1].options.path | string | `"/var/lib/grafana/dashboards/pulsar"` | |
| kube-prometheus-stack.grafana.dashboardProviders."dashboardproviders.yaml".providers[1].orgId | int | `1` | |
| kube-prometheus-stack.grafana.dashboardProviders."dashboardproviders.yaml".providers[1].type | string | `"file"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernel.bearerToken | string | `""` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernel.datasource | string | `"Prometheus"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernel.url | string | `"https://raw.githubusercontent.com/datalayer/helm-charts/main/charts/datalayer-observer/dashboards/remote-kernels-details.json"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernels.bearerToken | string | `""` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernel.url | string | `"https://raw.githubusercontent.com/datalayer/grafana-dashboards/main/dashboards/remote-kernels-details.json"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernels.datasource | string | `"Prometheus"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernels.url | string | `"https://raw.githubusercontent.com/datalayer/helm-charts/main/charts/datalayer-observer/dashboards/remote-kernels-overview.json"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.services.bearerToken | string | `""` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.remote_kernels.url | string | `"https://raw.githubusercontent.com/datalayer/grafana-dashboards/main/dashboards/remote-kernels-overview.json"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.services.datasource | string | `"Prometheus"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.services.url | string | `"https://raw.githubusercontent.com/datalayer/helm-charts/main/charts/datalayer-observer/dashboards/datalayer-service.json"` | |
| kube-prometheus-stack.grafana.dashboards.datalayer.services.url | string | `"https://raw.githubusercontent.com/datalayer/grafana-dashboards/main/dashboards/datalayer-service.json"` | |
| kube-prometheus-stack.grafana.dashboards.pulsar.bookkeeper.datasource | string | `"Prometheus"` | |
| kube-prometheus-stack.grafana.dashboards.pulsar.bookkeeper.url | string | `"https://raw.githubusercontent.com/streamnative/apache-pulsar-grafana-dashboard/master/dashboards.kubernetes/bookkeeper.json"` | |
| kube-prometheus-stack.grafana.dashboards.pulsar.broker.datasource | string | `"Prometheus"` | |
Expand Down
2 changes: 2 additions & 0 deletions charts/datalayer-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ For full documentation please checkout [Datalayer TECH](https://datalayer.tech/d
| operator.env.DATALAYER_PUB_SUB_ENGINE | string | `"pulsar"` | |
| operator.env.DATALAYER_PULSAR_URL | string | `"pulsar://datalayer-pulsar-broker.datalayer-pulsar.svc.cluster.local:6650"` | |
| operator.env.DATALAYER_RUN_HOST | string | `""` | |
| operator.env.DATALAYER_VAULT_TOKEN | string | `""` | |
| operator.env.DATALAYER_VAULT_URL | string | `"http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200"` | |
| operator.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT | string | `""` | |
| operator.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT | string | `""` | |
| operator.env.OTEL_SDK_DISABLED | string | `"false"` | |
Expand Down
16 changes: 10 additions & 6 deletions charts/datalayer-operator/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,29 @@ tests:
- name: AWS_SECRET_ACCESS_KEY
value: ""
- name: DATALAYER_AUTHZ_ENGINE
value: "openfga"
value: openfga
- name: DATALAYER_CERT_ISSUER
value: "letsencrypt"
value: letsencrypt
- name: DATALAYER_DOCKER_REGISTRY
value: ""
- name: DATALAYER_IAM_API_KEY
value: ""
- name: DATALAYER_IAM_HOST
value: "datalayer-iam-svc.datalayer-api.svc.cluster.local:9700"
value: datalayer-iam-svc.datalayer-api.svc.cluster.local:9700
- name: DATALAYER_INGRESS_CLASS_NAME
value: "datalayer-traefik"
value: datalayer-traefik
- name: DATALAYER_OPERATOR_API_KEY
value: ""
- name: DATALAYER_PUB_SUB_ENGINE
value: "pulsar"
value: pulsar
- name: DATALAYER_PULSAR_URL
value: "pulsar://datalayer-pulsar-broker.datalayer-pulsar.svc.cluster.local:6650"
value: pulsar://datalayer-pulsar-broker.datalayer-pulsar.svc.cluster.local:6650
- name: DATALAYER_RUN_HOST
value: ""
- name: DATALAYER_VAULT_TOKEN
value: ""
- name: DATALAYER_VAULT_URL
value: http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200
- name: OTEL_EXPORTER_OTLP_METRICS_ENDPOINT
value: ""
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
Expand Down
2 changes: 2 additions & 0 deletions charts/datalayer-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ operator:
DATALAYER_PUB_SUB_ENGINE: "pulsar"
DATALAYER_PULSAR_URL: "pulsar://datalayer-pulsar-broker.datalayer-pulsar.svc.cluster.local:6650"
DATALAYER_RUN_HOST: ""
DATALAYER_VAULT_TOKEN: ""
DATALAYER_VAULT_URL: "http://datalayer-vault-internal.datalayer-vault.svc.cluster.local:8200"
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""
OTEL_SDK_DISABLED: "false"
Expand Down
Loading