From cfb4d8cc950a490867d278bdcf78d5801dfb6791 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Tue, 20 Aug 2024 13:09:33 +0100 Subject: [PATCH 1/5] Add peer jwt token value to storcon helm chart --- charts/neon-storage-controller/README.md | 1 + charts/neon-storage-controller/templates/secrets.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charts/neon-storage-controller/README.md b/charts/neon-storage-controller/README.md index c3e6b5d..f4c9a58 100644 --- a/charts/neon-storage-controller/README.md +++ b/charts/neon-storage-controller/README.md @@ -67,6 +67,7 @@ Kubernetes: `^1.18.x-x` | settings.controlPlaneJwtToken | string | `""` | | | settings.databaseUrl | string | `""` | | | settings.jwtToken | string | `""` | | +| settings.peerJwtToken | string | `""` | JWT token used for communication with other storage controller instances in the region | | settings.publicKey | string | `""` | | | settings.sentryEnvironment | string | `"development"` | "development" or "production". It will be visible in sentry in order to filter issues | | settings.sentryUrl | string | `""` | url (will be converted into `SENTRY_DSN` environment variable) used by sentry to collect error/panic events in storage-controller | diff --git a/charts/neon-storage-controller/templates/secrets.yaml b/charts/neon-storage-controller/templates/secrets.yaml index 414fc5d..5970646 100644 --- a/charts/neon-storage-controller/templates/secrets.yaml +++ b/charts/neon-storage-controller/templates/secrets.yaml @@ -9,3 +9,4 @@ data: DATABASE_URL: {{ .Values.settings.databaseUrl | b64enc | quote }} CONTROL_PLANE_JWT_TOKEN: {{ .Values.settings.controlPlaneJwtToken | b64enc | quote }} PAGESERVER_JWT_TOKEN: {{ .Values.settings.jwtToken| b64enc | quote }} + PEER_JWT_TOKEN: {{ .Values.settings.peerJwtToken | b64enc | quote }} From 64dfc25ad76690befd689c1f3c1e16f33059ab66 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Tue, 20 Aug 2024 13:38:49 +0100 Subject: [PATCH 2/5] fixup: add peerJwtToken entry to values.yaml --- charts/neon-storage-controller/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/neon-storage-controller/values.yaml b/charts/neon-storage-controller/values.yaml index 37c9438..7fb7ffc 100644 --- a/charts/neon-storage-controller/values.yaml +++ b/charts/neon-storage-controller/values.yaml @@ -28,6 +28,8 @@ settings: databaseUrl: "" # May be set if AWS Secrets Manager is not being used: JWT token for authentication with pageservers jwtToken: "" + # JWT token for authentication with other storage controller instances + peerJwtToken: "" # May be set if AWS Secrets Manager is not being used: public key for authenticating incoming HTTP requests publicKey: "" # May be set if AWS Secrets Manager is not being used: JWT token for authenticating calls to computeHookUrl From 6c0560eb64b1cdeff091089cdc53bdada21aaac1 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Tue, 20 Aug 2024 13:39:49 +0100 Subject: [PATCH 3/5] chore: clean up references to AWS secret manager --- charts/neon-storage-controller/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/neon-storage-controller/values.yaml b/charts/neon-storage-controller/values.yaml index 7fb7ffc..6079877 100644 --- a/charts/neon-storage-controller/values.yaml +++ b/charts/neon-storage-controller/values.yaml @@ -24,15 +24,15 @@ settings: sentryUrl: "" # settings.sentryEnvironment -- "development" or "production". It will be visible in sentry in order to filter issues sentryEnvironment: "development" - # May be set if AWS Secrets Manager is not being used: postgresql:// URL to the database + # postgresql:// URL to the database databaseUrl: "" - # May be set if AWS Secrets Manager is not being used: JWT token for authentication with pageservers + # JWT token for authentication with pageservers jwtToken: "" # JWT token for authentication with other storage controller instances peerJwtToken: "" - # May be set if AWS Secrets Manager is not being used: public key for authenticating incoming HTTP requests + # public key for authenticating incoming HTTP requests publicKey: "" - # May be set if AWS Secrets Manager is not being used: JWT token for authenticating calls to computeHookUrl + # JWT token for authenticating calls to computeHookUrl controlPlaneJwtToken: "" # URL for compute notifications computeHookUrl: "" From 32872bd59f713c728e9e18b82d0f308ba216bb84 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Tue, 20 Aug 2024 13:47:12 +0100 Subject: [PATCH 4/5] fixup: readme fiddling --- charts/neon-storage-controller/README.md | 2 +- charts/neon-storage-controller/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/neon-storage-controller/README.md b/charts/neon-storage-controller/README.md index f4c9a58..13cf423 100644 --- a/charts/neon-storage-controller/README.md +++ b/charts/neon-storage-controller/README.md @@ -67,7 +67,7 @@ Kubernetes: `^1.18.x-x` | settings.controlPlaneJwtToken | string | `""` | | | settings.databaseUrl | string | `""` | | | settings.jwtToken | string | `""` | | -| settings.peerJwtToken | string | `""` | JWT token used for communication with other storage controller instances in the region | +| settings.peerJwtToken | string | `""` | JWT token for authentication with other storage controller instances | | settings.publicKey | string | `""` | | | settings.sentryEnvironment | string | `"development"` | "development" or "production". It will be visible in sentry in order to filter issues | | settings.sentryUrl | string | `""` | url (will be converted into `SENTRY_DSN` environment variable) used by sentry to collect error/panic events in storage-controller | diff --git a/charts/neon-storage-controller/values.yaml b/charts/neon-storage-controller/values.yaml index 6079877..cf0bb89 100644 --- a/charts/neon-storage-controller/values.yaml +++ b/charts/neon-storage-controller/values.yaml @@ -28,7 +28,7 @@ settings: databaseUrl: "" # JWT token for authentication with pageservers jwtToken: "" - # JWT token for authentication with other storage controller instances + # -- JWT token for authentication with other storage controller instances peerJwtToken: "" # public key for authenticating incoming HTTP requests publicKey: "" From ff80fab3f181e1956e9d2805767ded7c81cf9b93 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Tue, 20 Aug 2024 14:16:37 +0100 Subject: [PATCH 5/5] fixup: bump chart version --- charts/neon-storage-controller/Chart.yaml | 2 +- charts/neon-storage-controller/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/neon-storage-controller/Chart.yaml b/charts/neon-storage-controller/Chart.yaml index 12c5519..ad3c0ec 100644 --- a/charts/neon-storage-controller/Chart.yaml +++ b/charts/neon-storage-controller/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: neon-storage-controller description: Neon storage controller type: application -version: 1.1.2 +version: 1.1.3 appVersion: "0.1.0" kubeVersion: "^1.18.x-x" home: https://neon.tech diff --git a/charts/neon-storage-controller/README.md b/charts/neon-storage-controller/README.md index 13cf423..8506702 100644 --- a/charts/neon-storage-controller/README.md +++ b/charts/neon-storage-controller/README.md @@ -1,6 +1,6 @@ # neon-storage-controller -![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml) +![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml) Neon storage controller