Skip to content

Commit

Permalink
Merge branch 'main' into fix/add-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
fcollonval authored Aug 9, 2024
2 parents 5bad9fc + a924b4d commit b69641f
Show file tree
Hide file tree
Showing 27 changed files with 103 additions and 25 deletions.
4 changes: 2 additions & 2 deletions charts/datalayer-iam/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
description: Datalayer IAM
name: datalayer-iam
version: 0.1.1
version: 0.1.2
appVersion: 0.1.1
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-iam
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
5 changes: 3 additions & 2 deletions charts/datalayer-iam/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# datalayer-iam

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

Datalayer IAM

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down Expand Up @@ -68,4 +68,5 @@ Datalayer IAM
| iam.ingressClass | string | `"datalayer-traefik"` | |
| iam.port | int | `9700` | |
| iam.sidecar.image | string | `"datalayer/whoami:0.0.6"` | |
| iam.tolerations | object | `{}` | |

3 changes: 3 additions & 0 deletions charts/datalayer-iam/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
{{- with .Values.iam.affinity }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.iam.tolerations }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}
imagePullSecrets:
- name: reg-creds
containers:
Expand Down
16 changes: 16 additions & 0 deletions charts/datalayer-iam/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ tests:
operator: In
values:
- "true"
- it: "test tolerations"
set:
iam.tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
asserts:
- isSubset:
path: spec.template.spec
content:
tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
- it: "test environment variables"
asserts:
- isSubset:
Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-iam/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ iam:
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""
OTEL_SDK_DISABLED: "false"

tolerations: {}
# resources:
# limits:
# memory: "8192Mi"
Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-jump/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Datalayer Jump
name: jump
version: 0.0.6
appVersion: 0.0.6
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-jump
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-jump/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Datalayer Jump

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down
4 changes: 2 additions & 2 deletions charts/datalayer-jupyter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
description: Datalayer Jupyter
name: datalayer-jupyter
version: 0.1.1
version: 0.1.2
appVersion: 0.1.1
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-jupyter
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
5 changes: 3 additions & 2 deletions charts/datalayer-jupyter/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# datalayer-jupyter

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

Datalayer Jupyter

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down Expand Up @@ -51,4 +51,5 @@ Datalayer Jupyter
| jupyter.ingressClass | string | `"datalayer-traefik"` | |
| jupyter.port | int | `9500` | |
| jupyter.sidecar.image | string | `"datalayer/whoami:0.0.6"` | |
| jupyter.tolerations | object | `{}` | |

3 changes: 3 additions & 0 deletions charts/datalayer-jupyter/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
{{- with .Values.jupyter.affinity }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.jupyter.tolerations }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}
imagePullSecrets:
- name: reg-creds
containers:
Expand Down
16 changes: 16 additions & 0 deletions charts/datalayer-jupyter/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ tests:
operator: In
values:
- "true"
- it: "test tolerations"
set:
jupyter.tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
asserts:
- isSubset:
path: spec.template.spec
content:
tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
- it: "test environment variables"
asserts:
- isSubset:
Expand Down
1 change: 1 addition & 0 deletions charts/datalayer-jupyter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ jupyter:
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""
OTEL_SDK_DISABLED: "false"
tolerations: {}
2 changes: 1 addition & 1 deletion charts/datalayer-library/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Datalayer Library
name: datalayer-library
version: 0.0.6
appVersion: 0.0.6
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-library
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-library/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Datalayer Library

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-observer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Datalayer Observer
name: datalayer-observer
version: 0.1.0
appVersion: 0.1.0
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-observer
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
18 changes: 17 additions & 1 deletion charts/datalayer-observer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Datalayer Observer

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down Expand Up @@ -32,6 +32,8 @@ Datalayer Observer
| kube-prometheus-stack.alertmanager.alertmanagerSpec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"true"` | |
| kube-prometheus-stack.alertmanager.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.alertmanager.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.coreDns.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.coreDns.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.defaultRules.create | bool | `true` | |
| kube-prometheus-stack.defaultRules.rules.alertmanager | bool | `false` | |
| kube-prometheus-stack.enabled | bool | `true` | |
Expand Down Expand Up @@ -128,6 +130,20 @@ Datalayer Observer
| kube-prometheus-stack.grafana.serviceMonitor.path | string | `"/grafana/metrics"` | |
| kube-prometheus-stack.grafana.sidecar.datasources.exemplarTraceIdDestinations.datasourceUid | string | `"tempo"` | |
| kube-prometheus-stack.grafana.sidecar.datasources.exemplarTraceIdDestinations.traceIdLabelName | string | `"TraceID"` | |
| kube-prometheus-stack.kube-state-metrics.prometheus.monitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kube-state-metrics.prometheus.monitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubeApiServer.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubeApiServer.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubeControllerManager.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubeControllerManager.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubeEtcd.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubeEtcd.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubeProxy.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubeProxy.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubeScheduler.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubeScheduler.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.kubelet.serviceMonitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.kubelet.serviceMonitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
| kube-prometheus-stack.prometheus-node-exporter.enabled | bool | `true` | |
| kube-prometheus-stack.prometheus-node-exporter.prometheus.monitor.additionalLabels."monitoring.datalayer.io/enabled" | string | `"true"` | |
| kube-prometheus-stack.prometheus-node-exporter.prometheus.monitor.additionalLabels."monitoring.datalayer.io/instance" | string | `"observer"` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/datalayer-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
description: Datalayer Operator
name: datalayer-operator
version: 0.1.1
version: 0.1.2
appVersion: 0.1.1
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-operator
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
5 changes: 3 additions & 2 deletions charts/datalayer-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# datalayer-operator

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

Datalayer Operator

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down Expand Up @@ -44,4 +44,5 @@ Datalayer Operator
| operator.imagePullPolicy | string | `"Always"` | |
| operator.port | int | `2111` | |
| operator.sidecar.image | string | `"datalayer/whoami:0.0.6"` | |
| operator.tolerations | object | `{}` | |

3 changes: 3 additions & 0 deletions charts/datalayer-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
{{- with .Values.operator.affinity }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.operator.tolerations }}
tolerations: {{- toYaml . | nindent 8 }}
{{- end }}
imagePullSecrets:
- name: reg-creds
containers:
Expand Down
16 changes: 16 additions & 0 deletions charts/datalayer-operator/tests/deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ tests:
operator: In
values:
- "true"
- it: "test tolerations"
set:
operator.tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
asserts:
- isSubset:
path: spec.template.spec
content:
tolerations:
- key: "key1"
operator: "Equal"
value: "value1"
effect: "NoSchedule"
- it: "test environment variables"
asserts:
- isSubset:
Expand Down
1 change: 1 addition & 0 deletions charts/datalayer-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ operator:
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""
OTEL_SDK_DISABLED: "false"
tolerations: {}
2 changes: 1 addition & 1 deletion charts/datalayer-spacer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Datalayer Spacer
name: datalayer-spacer
version: 0.0.6
appVersion: 0.0.6
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-spacer
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
2 changes: 1 addition & 1 deletion charts/datalayer-spacer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Datalayer Spacer

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down
2 changes: 1 addition & 1 deletion charts/jupyter-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Jupyter Server
name: jupyter-server
version: 0.0.6
appVersion: 0.0.6
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-jupyter-server
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
2 changes: 1 addition & 1 deletion charts/jupyter-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Jupyter Server

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down
2 changes: 1 addition & 1 deletion charts/jupyterpool/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Jupyterpool
name: jupyterpool
version: 0.0.6
appVersion: 0.0.6
home: https://datalayer.io
home: https://datalayer.tech
sources:
- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-jupyterpool
icon: https://assets.datalayer.tech/datalayer-square.png
Expand Down
2 changes: 1 addition & 1 deletion charts/jupyterpool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Jupyterpool

**Homepage:** <https://datalayer.io>
**Homepage:** <https://datalayer.tech>

## Maintainers

Expand Down

0 comments on commit b69641f

Please sign in to comment.