From 01cab8373918146d3c848c091824765fef92581b Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 1 Oct 2024 14:44:21 +0200 Subject: [PATCH 1/5] chore: add datalayer mailer --- charts/datalayer-mailer/Chart.yaml | 13 ++++++++ charts/datalayer-mailer/README.md | 26 ++++++++++++++++ charts/datalayer-mailer/templates/mailer.yaml | 30 +++++++++++++++++++ charts/datalayer-mailer/values.yaml | 4 +++ 4 files changed, 73 insertions(+) create mode 100644 charts/datalayer-mailer/Chart.yaml create mode 100644 charts/datalayer-mailer/README.md create mode 100644 charts/datalayer-mailer/templates/mailer.yaml create mode 100644 charts/datalayer-mailer/values.yaml diff --git a/charts/datalayer-mailer/Chart.yaml b/charts/datalayer-mailer/Chart.yaml new file mode 100644 index 0000000..a3ad22e --- /dev/null +++ b/charts/datalayer-mailer/Chart.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +description: Datalayer Mailer +name: datalayer-mailer +version: 0.0.1 +appVersion: 0.0.1 +home: https://datalayer.tech +sources: +- https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-mailer +icon: https://assets.datalayer.tech/datalayer-square.png +maintainers: +- name: Datalayer + email: support@datalayer.io + url: https://datalayer.io diff --git a/charts/datalayer-mailer/README.md b/charts/datalayer-mailer/README.md new file mode 100644 index 0000000..8631e56 --- /dev/null +++ b/charts/datalayer-mailer/README.md @@ -0,0 +1,26 @@ +# datalayer-mailer + +![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) + +Datalayer Mailer + +**Homepage:** + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| Datalayer | | | + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| mailer.image | string | `nil` | | +| mailer.imagePullPolicy | string | `"Always"` | | +| mailer.namespace | string | `"datalayer-system"` | | + diff --git a/charts/datalayer-mailer/templates/mailer.yaml b/charts/datalayer-mailer/templates/mailer.yaml new file mode 100644 index 0000000..bbd9447 --- /dev/null +++ b/charts/datalayer-mailer/templates/mailer.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: Pod +metadata: + name: mailer + namespace: {{ default .Values.mailer.namespace .Release.Namespace }} + labels: + app: mailer +spec: + imagePullSecrets: + - name: reg-creds + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: role.datalayer.io/system + operator: In + values: + - "true" + restartPolicy: OnFailure + containers: + - image: {{ .Values.mailer.image }} + name: mailer + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 250m + memory: 64Mi diff --git a/charts/datalayer-mailer/values.yaml b/charts/datalayer-mailer/values.yaml new file mode 100644 index 0000000..35e2ba0 --- /dev/null +++ b/charts/datalayer-mailer/values.yaml @@ -0,0 +1,4 @@ +mailer: + image: + imagePullPolicy: Always + namespace: datalayer-system From 7f267b6e0e8c286376b6bf89fa08c64ea28b7639 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 1 Oct 2024 15:01:08 +0200 Subject: [PATCH 2/5] mailer: deployment --- charts/datalayer-ceph-storage/README.md | 16 ++++------ charts/datalayer-iam/README.md | 2 +- charts/datalayer-iam/README.md.gotmpl | 2 +- charts/datalayer-iam/templates/NOTES.txt | 2 +- charts/datalayer-jupyter/README.md | 2 +- charts/datalayer-jupyter/README.md.gotmpl | 2 +- charts/datalayer-library/README.md | 2 +- charts/datalayer-library/README.md.gotmpl | 2 +- charts/datalayer-mailer/README.md | 20 ++++++------- charts/datalayer-mailer/templates/mailer.yaml | 30 ------------------- charts/datalayer-mailer/values.yaml | 10 +++++++ charts/datalayer-operator/README.md | 2 +- charts/datalayer-operator/README.md.gotmpl | 2 +- charts/datalayer-spacer/README.md | 2 +- charts/datalayer-spacer/README.md.gotmpl | 2 +- 15 files changed, 35 insertions(+), 63 deletions(-) delete mode 100644 charts/datalayer-mailer/templates/mailer.yaml diff --git a/charts/datalayer-ceph-storage/README.md b/charts/datalayer-ceph-storage/README.md index 0a5e997..1406bf1 100644 --- a/charts/datalayer-ceph-storage/README.md +++ b/charts/datalayer-ceph-storage/README.md @@ -1,20 +1,14 @@ -# datalayer-storage +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +# datalayer-storage Datalayer Storage -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Datalayer | | | +![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) -## Source Code +## Documentation -* +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-iam/README.md b/charts/datalayer-iam/README.md index 957163c..210216c 100644 --- a/charts/datalayer-iam/README.md +++ b/charts/datalayer-iam/README.md @@ -8,7 +8,7 @@ Datalayer IAM ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-iam/README.md.gotmpl b/charts/datalayer-iam/README.md.gotmpl index 4e484e1..92ff442 100644 --- a/charts/datalayer-iam/README.md.gotmpl +++ b/charts/datalayer-iam/README.md.gotmpl @@ -7,7 +7,7 @@ ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). {{ template "chart.requirementsSection" . }} diff --git a/charts/datalayer-iam/templates/NOTES.txt b/charts/datalayer-iam/templates/NOTES.txt index 4b889c8..99db558 100644 --- a/charts/datalayer-iam/templates/NOTES.txt +++ b/charts/datalayer-iam/templates/NOTES.txt @@ -2,7 +2,7 @@ Your iam server has now been installed, and can be accessed in the following way 1. Connect to the iam CLI pod: - kubectl exec -n {{ .Release.Namespace }} $(kubectl get pod -n {{ .Release.Namespace }} --selector=app={{ template "iam.name" . }} -o jsonpath='{.items...metadata.name}') -- sh + kubectl exec -n {{ .Release.Namespace }} $(kubectl get pod -n {{ .Release.Namespace }} --selector=app={{ template "iam.app-name" . }} -o jsonpath='{.items...metadata.name}') -- sh 2. Connect with HTTP internally, within the kubernetes cluster on: diff --git a/charts/datalayer-jupyter/README.md b/charts/datalayer-jupyter/README.md index c57d655..370d6b3 100644 --- a/charts/datalayer-jupyter/README.md +++ b/charts/datalayer-jupyter/README.md @@ -8,7 +8,7 @@ Datalayer Jupyter ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-jupyter/README.md.gotmpl b/charts/datalayer-jupyter/README.md.gotmpl index 4e484e1..92ff442 100644 --- a/charts/datalayer-jupyter/README.md.gotmpl +++ b/charts/datalayer-jupyter/README.md.gotmpl @@ -7,7 +7,7 @@ ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). {{ template "chart.requirementsSection" . }} diff --git a/charts/datalayer-library/README.md b/charts/datalayer-library/README.md index 276d75c..d2b4600 100644 --- a/charts/datalayer-library/README.md +++ b/charts/datalayer-library/README.md @@ -8,7 +8,7 @@ Datalayer Library ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-library/README.md.gotmpl b/charts/datalayer-library/README.md.gotmpl index 4e484e1..92ff442 100644 --- a/charts/datalayer-library/README.md.gotmpl +++ b/charts/datalayer-library/README.md.gotmpl @@ -7,7 +7,7 @@ ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). {{ template "chart.requirementsSection" . }} diff --git a/charts/datalayer-mailer/README.md b/charts/datalayer-mailer/README.md index 8631e56..3d95bdd 100644 --- a/charts/datalayer-mailer/README.md +++ b/charts/datalayer-mailer/README.md @@ -1,26 +1,24 @@ -# datalayer-mailer +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +# datalayer-mailer Datalayer Mailer -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| Datalayer | | | +![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) -## Source Code +## Documentation -* +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| +| mailer.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"role.datalayer.io/system"` | | +| mailer.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"In"` | | +| mailer.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values[0] | string | `"true"` | | | mailer.image | string | `nil` | | | mailer.imagePullPolicy | string | `"Always"` | | | mailer.namespace | string | `"datalayer-system"` | | +| mailer.port | int | `2331` | | diff --git a/charts/datalayer-mailer/templates/mailer.yaml b/charts/datalayer-mailer/templates/mailer.yaml deleted file mode 100644 index bbd9447..0000000 --- a/charts/datalayer-mailer/templates/mailer.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: mailer - namespace: {{ default .Values.mailer.namespace .Release.Namespace }} - labels: - app: mailer -spec: - imagePullSecrets: - - name: reg-creds - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: role.datalayer.io/system - operator: In - values: - - "true" - restartPolicy: OnFailure - containers: - - image: {{ .Values.mailer.image }} - name: mailer - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 64Mi diff --git a/charts/datalayer-mailer/values.yaml b/charts/datalayer-mailer/values.yaml index 35e2ba0..2d0cabc 100644 --- a/charts/datalayer-mailer/values.yaml +++ b/charts/datalayer-mailer/values.yaml @@ -1,4 +1,14 @@ mailer: image: imagePullPolicy: Always + port: 2331 namespace: datalayer-system + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: role.datalayer.io/system + operator: In + values: + - "true" diff --git a/charts/datalayer-operator/README.md b/charts/datalayer-operator/README.md index fc27452..dffe672 100644 --- a/charts/datalayer-operator/README.md +++ b/charts/datalayer-operator/README.md @@ -8,7 +8,7 @@ Datalayer Operator ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-operator/README.md.gotmpl b/charts/datalayer-operator/README.md.gotmpl index 4e484e1..92ff442 100644 --- a/charts/datalayer-operator/README.md.gotmpl +++ b/charts/datalayer-operator/README.md.gotmpl @@ -7,7 +7,7 @@ ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). {{ template "chart.requirementsSection" . }} diff --git a/charts/datalayer-spacer/README.md b/charts/datalayer-spacer/README.md index d4b1c82..0ccc2e9 100644 --- a/charts/datalayer-spacer/README.md +++ b/charts/datalayer-spacer/README.md @@ -8,7 +8,7 @@ Datalayer Spacer ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). ## Values diff --git a/charts/datalayer-spacer/README.md.gotmpl b/charts/datalayer-spacer/README.md.gotmpl index 4e484e1..92ff442 100644 --- a/charts/datalayer-spacer/README.md.gotmpl +++ b/charts/datalayer-spacer/README.md.gotmpl @@ -7,7 +7,7 @@ ## Documentation -For full documentation please checkout [Datalayer TECH](https://datalayer.tech/docs/build). +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). {{ template "chart.requirementsSection" . }} From 0582705d2670bddba274fa3fe0f63ee8d20c078c Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 1 Oct 2024 15:06:19 +0200 Subject: [PATCH 3/5] chore: template --- .../datalayer-ceph-cluster/README.md.gotmpl | 16 ++++++ .../datalayer-ceph-storage/README.md.gotmpl | 16 ++++++ charts/datalayer-ceph/README.md.gotmpl | 16 ++++++ charts/datalayer-mailer/README.md.gotmpl | 16 ++++++ charts/datalayer-mailer/templates/NOTES.txt | 9 +++ .../datalayer-mailer/templates/_helpers.yaml | 29 ++++++++++ .../templates/deployment.yaml | 55 +++++++++++++++++++ 7 files changed, 157 insertions(+) create mode 100644 charts/datalayer-ceph-cluster/README.md.gotmpl create mode 100644 charts/datalayer-ceph-storage/README.md.gotmpl create mode 100644 charts/datalayer-ceph/README.md.gotmpl create mode 100644 charts/datalayer-mailer/README.md.gotmpl create mode 100644 charts/datalayer-mailer/templates/NOTES.txt create mode 100644 charts/datalayer-mailer/templates/_helpers.yaml create mode 100644 charts/datalayer-mailer/templates/deployment.yaml diff --git a/charts/datalayer-ceph-cluster/README.md.gotmpl b/charts/datalayer-ceph-cluster/README.md.gotmpl new file mode 100644 index 0000000..92ff442 --- /dev/null +++ b/charts/datalayer-ceph-cluster/README.md.gotmpl @@ -0,0 +1,16 @@ +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) + +{{ template "chart.header" . }} +{{ template "chart.description" . }} + +{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} + +## Documentation + +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} + +{{ template "helm-docs.versionFooter" . }} diff --git a/charts/datalayer-ceph-storage/README.md.gotmpl b/charts/datalayer-ceph-storage/README.md.gotmpl new file mode 100644 index 0000000..92ff442 --- /dev/null +++ b/charts/datalayer-ceph-storage/README.md.gotmpl @@ -0,0 +1,16 @@ +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) + +{{ template "chart.header" . }} +{{ template "chart.description" . }} + +{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} + +## Documentation + +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} + +{{ template "helm-docs.versionFooter" . }} diff --git a/charts/datalayer-ceph/README.md.gotmpl b/charts/datalayer-ceph/README.md.gotmpl new file mode 100644 index 0000000..92ff442 --- /dev/null +++ b/charts/datalayer-ceph/README.md.gotmpl @@ -0,0 +1,16 @@ +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) + +{{ template "chart.header" . }} +{{ template "chart.description" . }} + +{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} + +## Documentation + +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} + +{{ template "helm-docs.versionFooter" . }} diff --git a/charts/datalayer-mailer/README.md.gotmpl b/charts/datalayer-mailer/README.md.gotmpl new file mode 100644 index 0000000..92ff442 --- /dev/null +++ b/charts/datalayer-mailer/README.md.gotmpl @@ -0,0 +1,16 @@ +[![Datalayer](https://assets.datalayer.tech/datalayer-25.svg)](https://datalayer.io) + +{{ template "chart.header" . }} +{{ template "chart.description" . }} + +{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }} + +## Documentation + +For full documentation please checkout [Datalayer Tech](https://datalayer.tech/docs/build). + +{{ template "chart.requirementsSection" . }} + +{{ template "chart.valuesSection" . }} + +{{ template "helm-docs.versionFooter" . }} diff --git a/charts/datalayer-mailer/templates/NOTES.txt b/charts/datalayer-mailer/templates/NOTES.txt new file mode 100644 index 0000000..9d9974c --- /dev/null +++ b/charts/datalayer-mailer/templates/NOTES.txt @@ -0,0 +1,9 @@ +Your mailer has now been installed, and can be accessed in the following ways: + +1. Connect with a shell + + kubectl exec -n {{ .Release.Namespace }} $(kubectl get pod -n {{ .Release.Namespace }} --selector=app={{ template "mailer.app-name" . }} -o jsonpath='{.items...metadata.name}') -it -- sh + +2. Read the logs + + kubectl logs -n {{ .Release.Namespace }} $(kubectl get pod -n {{ .Release.Namespace }} --selector=app={{ template "mailer.app-name" . }} -o jsonpath='{.items...metadata.name}') diff --git a/charts/datalayer-mailer/templates/_helpers.yaml b/charts/datalayer-mailer/templates/_helpers.yaml new file mode 100644 index 0000000..7cc7b76 --- /dev/null +++ b/charts/datalayer-mailer/templates/_helpers.yaml @@ -0,0 +1,29 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "mailer.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 24 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 24 chars because some kubernetes name fields are limited to this (by the DNS naming spec). +*/}} +{{- define "mailer.fullname" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Define the name of the client service for mailer. +*/}} +{{- define "mailer.service-name" -}} +{{- printf "%s-%s" (include "mailer.fullname" .) "svc" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Define the value for the app label. +*/}} +{{- define "mailer.app-name" -}} +{{- printf "%s" .Chart.Name | replace "datalayer-" "" -}} +{{- end -}} diff --git a/charts/datalayer-mailer/templates/deployment.yaml b/charts/datalayer-mailer/templates/deployment.yaml new file mode 100644 index 0000000..3ba72a1 --- /dev/null +++ b/charts/datalayer-mailer/templates/deployment.yaml @@ -0,0 +1,55 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Release.Name }} + namespace: {{ default .Values.mailer.namespace .Release.Namespace }} + labels: + app: {{ template "mailer.app-name" . }} +spec: + replicas: 1 + selector: + matchLabels: + app: {{ template "mailer.app-name" . }} + strategy: + rollingUpdate: + maxUnavailable: 0 + template: + metadata: + labels: + app: {{ template "mailer.app-name" . }} + release: {{ .Release.Name }} + datalayer.io/app: {{ template "mailer.app-name" . }} + spec: + terminationGracePeriodSeconds: 0 + {{- with .Values.mailer.affinity }} + affinity: {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.mailer.tolerations }} + tolerations: {{- toYaml . | nindent 8 }} + {{- end }} + imagePullSecrets: + - name: reg-creds + containers: + - name: mailer + image: {{ .Values.mailer.image }} + imagePullPolicy: {{ .Values.mailer.imagePullPolicy }} + ports: + - containerPort: {{ .Values.mailer.port }} + protocol: TCP + {{- if or .Values.mailer.env .Values.mailer.envValueFrom }} + env: + {{- range $key, $value := .Values.mailer.envValueFrom }} + - name: {{ $key }} + valueFrom: {{- $value | toYaml | nindent 16 }} + {{- end }} + {{- range $key, $value := .Values.mailer.env }} + - name: {{ $key }} + value: {{ $value | quote }} + {{- end }} + {{- end }} + {{- with .Values.mailer.resources }} + resources: {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.mailer.volumeMounts }} + volumeMounts: {{- toYaml . | nindent 12 }} + {{- end }} From 2b352c0faa478e81ba62c009db131d2964fd31c2 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 2 Oct 2024 07:43:21 +0200 Subject: [PATCH 4/5] chore: bump versions --- charts/datalayer-iam/Chart.yaml | 4 ++-- charts/datalayer-iam/README.md | 4 ++-- charts/datalayer-iam/values.yaml | 2 +- charts/datalayer-jupyter/Chart.yaml | 4 ++-- charts/datalayer-jupyter/README.md | 4 ++-- charts/datalayer-jupyter/tests/deployment_test.yaml | 2 +- charts/datalayer-jupyter/values.yaml | 2 +- charts/datalayer-operator/Chart.yaml | 4 ++-- charts/datalayer-operator/README.md | 6 ++++-- charts/datalayer-operator/values.yaml | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/charts/datalayer-iam/Chart.yaml b/charts/datalayer-iam/Chart.yaml index 3050e63..e62d5ae 100644 --- a/charts/datalayer-iam/Chart.yaml +++ b/charts/datalayer-iam/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Datalayer IAM name: datalayer-iam -version: 1.0.0 -appVersion: 1.0.0 +version: 1.0.1 +appVersion: 1.0.1 home: https://datalayer.tech sources: - https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-iam diff --git a/charts/datalayer-iam/README.md b/charts/datalayer-iam/README.md index 210216c..34a2c70 100644 --- a/charts/datalayer-iam/README.md +++ b/charts/datalayer-iam/README.md @@ -4,7 +4,7 @@ Datalayer IAM -![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square) ## Documentation @@ -59,7 +59,7 @@ For full documentation please checkout [Datalayer Tech](https://datalayer.tech/d | 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:1.0.0"` | | +| iam.image | string | `"datalayer/iam:1.0.1"` | | | iam.imagePullPolicy | string | `"Always"` | | | iam.ingressClass | string | `"datalayer-traefik"` | | | iam.port | int | `9700` | | diff --git a/charts/datalayer-iam/values.yaml b/charts/datalayer-iam/values.yaml index 390c428..d5347d3 100644 --- a/charts/datalayer-iam/values.yaml +++ b/charts/datalayer-iam/values.yaml @@ -1,5 +1,5 @@ iam: - image: datalayer/iam:1.0.0 + image: datalayer/iam:1.0.1 imagePullPolicy: Always port: 9700 sidecar: diff --git a/charts/datalayer-jupyter/Chart.yaml b/charts/datalayer-jupyter/Chart.yaml index 59e017a..32a1612 100644 --- a/charts/datalayer-jupyter/Chart.yaml +++ b/charts/datalayer-jupyter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Datalayer Jupyter name: datalayer-jupyter -version: 1.0.0 -appVersion: 1.0.0 +version: 1.0.1 +appVersion: 1.0.1 home: https://datalayer.tech sources: - https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-jupyter diff --git a/charts/datalayer-jupyter/README.md b/charts/datalayer-jupyter/README.md index 370d6b3..6fcc7ef 100644 --- a/charts/datalayer-jupyter/README.md +++ b/charts/datalayer-jupyter/README.md @@ -4,7 +4,7 @@ Datalayer Jupyter -![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square) ## Documentation @@ -40,7 +40,7 @@ For full documentation please checkout [Datalayer Tech](https://datalayer.tech/d | jupyter.envValueFrom.DATALAYER_SOLR_PASSWORD.secretKeyRef.name | string | `"solr-basic-auth"` | | | jupyter.envValueFrom.DATALAYER_SOLR_USERNAME.secretKeyRef.key | string | `"username"` | | | jupyter.envValueFrom.DATALAYER_SOLR_USERNAME.secretKeyRef.name | string | `"solr-basic-auth"` | | -| jupyter.image | string | `"datalayer/jupyter:1.0.0"` | | +| jupyter.image | string | `"datalayer/jupyter:1.0.1"` | | | jupyter.imagePullPolicy | string | `"Always"` | | | jupyter.ingressClass | string | `"datalayer-traefik"` | | | jupyter.port | int | `9500` | | diff --git a/charts/datalayer-jupyter/tests/deployment_test.yaml b/charts/datalayer-jupyter/tests/deployment_test.yaml index 9045ab2..656159b 100644 --- a/charts/datalayer-jupyter/tests/deployment_test.yaml +++ b/charts/datalayer-jupyter/tests/deployment_test.yaml @@ -82,7 +82,7 @@ tests: value: "" - name: OTEL_SDK_DISABLED value: "false" - image: datalayer/jupyter:1.0.0 + image: datalayer/jupyter:1.0.1 imagePullPolicy: Always name: jupyter ports: diff --git a/charts/datalayer-jupyter/values.yaml b/charts/datalayer-jupyter/values.yaml index 059af6a..00134af 100644 --- a/charts/datalayer-jupyter/values.yaml +++ b/charts/datalayer-jupyter/values.yaml @@ -1,5 +1,5 @@ jupyter: - image: datalayer/jupyter:1.0.0 + image: datalayer/jupyter:1.0.1 imagePullPolicy: Always sidecar: image: datalayer/whoami:0.0.6 diff --git a/charts/datalayer-operator/Chart.yaml b/charts/datalayer-operator/Chart.yaml index 6cf7ad6..419badf 100644 --- a/charts/datalayer-operator/Chart.yaml +++ b/charts/datalayer-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Datalayer Operator name: datalayer-operator -version: 1.0.0 -appVersion: 1.0.0 +version: 1.0.1 +appVersion: 1.0.1 home: https://datalayer.tech sources: - https://github.com/datalayer/helm-charts/tree/main/charts/datalayer-operator diff --git a/charts/datalayer-operator/README.md b/charts/datalayer-operator/README.md index dffe672..f317b0c 100644 --- a/charts/datalayer-operator/README.md +++ b/charts/datalayer-operator/README.md @@ -4,7 +4,7 @@ Datalayer Operator -![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square) ## Documentation @@ -31,10 +31,12 @@ 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"` | | -| operator.image | string | `"datalayer/operator:1.0.0"` | | +| operator.image | string | `"datalayer/operator:1.0.1"` | | | operator.imagePullPolicy | string | `"Always"` | | | operator.port | int | `2111` | | | operator.sidecar.image | string | `"datalayer/whoami:0.0.6"` | | diff --git a/charts/datalayer-operator/values.yaml b/charts/datalayer-operator/values.yaml index bca6e5c..103c0da 100644 --- a/charts/datalayer-operator/values.yaml +++ b/charts/datalayer-operator/values.yaml @@ -1,5 +1,5 @@ operator: - image: datalayer/operator:1.0.0 + image: datalayer/operator:1.0.1 sidecar: image: datalayer/whoami:0.0.6 imagePullPolicy: Always From f99ba7ff121b2c6614998b7644d1b0a7fc471338 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 2 Oct 2024 07:52:25 +0200 Subject: [PATCH 5/5] fix: test --- charts/datalayer-operator/tests/deployment_test.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/datalayer-operator/tests/deployment_test.yaml b/charts/datalayer-operator/tests/deployment_test.yaml index e46477e..a19e415 100644 --- a/charts/datalayer-operator/tests/deployment_test.yaml +++ b/charts/datalayer-operator/tests/deployment_test.yaml @@ -38,6 +38,8 @@ tests: path: spec.template.spec.containers[0] content: env: + - name: DATALAYER_USERS_VOLUME_CLAIM_NAME + value: cephfs-users-pvc - name: AWS_ACCESS_KEY_ID value: "" - name: AWS_DEFAULT_REGION @@ -64,6 +66,10 @@ tests: 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