From acc547860f99c1433d7267858c5f877e7b5e3836 Mon Sep 17 00:00:00 2001 From: chris-vest Date: Fri, 15 Nov 2024 17:13:44 +0100 Subject: [PATCH 1/6] update serviceName to use headless service --- charts/nitro/templates/statefulset.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/nitro/templates/statefulset.yaml b/charts/nitro/templates/statefulset.yaml index 4d8d27c..01f322a 100644 --- a/charts/nitro/templates/statefulset.yaml +++ b/charts/nitro/templates/statefulset.yaml @@ -7,7 +7,7 @@ metadata: annotations: nitro.arbitrum.io/desiredReplicas: {{ $.Values.replicaCount | quote }} spec: - serviceName: "{{ include "nitro.fullname" . }}" + serviceName: {{ include "nitro.fullname" . }}-headless replicas: {{ .Values.replicaCount }} selector: matchLabels: @@ -15,7 +15,7 @@ spec: podManagementPolicy: Parallel {{- if .Values.updateStrategy }} {{- with .Values.updateStrategy }} - updateStrategy: + updateStrategy: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} @@ -276,7 +276,7 @@ spec: app: {{ template "nitro.name" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - spec: + spec: accessModes: {{- toYaml .Values.blobPersistence.accessModes | nindent 8 }} {{- if .Values.blobPersistence.storageClassName }} From 8cf365025cafede5c8c7a43650bef55df5cdb268 Mon Sep 17 00:00:00 2001 From: chris-vest Date: Fri, 15 Nov 2024 17:14:12 +0100 Subject: [PATCH 2/6] update serviceName to use headless service --- charts/nitro/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nitro/Chart.yaml b/charts/nitro/Chart.yaml index fe5fbdf..ccca64b 100644 --- a/charts/nitro/Chart.yaml +++ b/charts/nitro/Chart.yaml @@ -7,6 +7,6 @@ maintainers: type: application -version: 0.6.20 +version: 0.6.21 appVersion: "v3.2.1-d81324d" From 8c76417c4a5facc0be1dec3c9c0a892781cf44a8 Mon Sep 17 00:00:00 2001 From: chris-vest Date: Wed, 20 Nov 2024 10:55:43 +0100 Subject: [PATCH 3/6] add annotations to headless serviec --- charts/nitro/templates/headlessservice.yaml | 4 ++++ charts/nitro/values.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/nitro/templates/headlessservice.yaml b/charts/nitro/templates/headlessservice.yaml index 1451fcb..db162f5 100644 --- a/charts/nitro/templates/headlessservice.yaml +++ b/charts/nitro/templates/headlessservice.yaml @@ -5,6 +5,10 @@ metadata: name: {{ include "nitro.fullname" . }}-headless labels: {{- include "nitro.labels" . | nindent 4 }} + annotations: + {{- if $.Values.headless.annotations }} + {{- toYaml $.Values.headless.annotations | nindent 4 }} + {{- end }} spec: type: ClusterIP clusterIP: None diff --git a/charts/nitro/values.yaml b/charts/nitro/values.yaml index dcbc13b..55b7120 100644 --- a/charts/nitro/values.yaml +++ b/charts/nitro/values.yaml @@ -100,7 +100,7 @@ serviceMonitor: ## @param perReplicaService.enabled Enable a service for each sts replica ## @param perReplicaService.publishNotReadyAddresses Publish not ready addresses -## @param perReplicaService.annotations Annotations for the service +## @param perReplicaService.annotations Annotations for the per replica service perReplicaService: enabled: false publishNotReadyAddresses: true @@ -108,7 +108,7 @@ perReplicaService: ## @param perReplicaHeadlessService.enabled Enable a headless service for each sts replica ## @param perReplicaHeadlessService.publishNotReadyAddresses Publish not ready addresses -## @param perReplicaHeadlessService.annotations Annotations for the headless service +## @param perReplicaHeadlessService.annotations Annotations for the per replica headless service perReplicaHeadlessService: enabled: false publishNotReadyAddresses: true @@ -116,9 +116,11 @@ perReplicaHeadlessService: ## @param headlessservice.enabled Enable headless service ## @param headlessservice.publishNotReadyAddresses Publish not ready addresses +## @param headlessservice.annotations Annotations for the headless service headlessservice: enabled: true publishNotReadyAddresses: true + annotations: {} ## @param jwtSecret.enabled Enable a jwt secret for use with the stateless validator ## @param jwtSecret.value Value of the jwt secret for use with the stateless validator From c0018574261be9b27e783c343b43c1a610fae341 Mon Sep 17 00:00:00 2001 From: chris-vest Date: Wed, 20 Nov 2024 09:57:28 +0000 Subject: [PATCH 4/6] Update README and values.schema.json for modified charts --- charts/nitro/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/nitro/README.md b/charts/nitro/README.md index 28bc357..705343f 100644 --- a/charts/nitro/README.md +++ b/charts/nitro/README.md @@ -112,12 +112,13 @@ helm install xai offchainlabs/nitro -f values.yaml | `serviceMonitor.relabelings` | Add relabelings for the metrics being scraped | `[]` | | `perReplicaService.enabled` | Enable a service for each sts replica | `false` | | `perReplicaService.publishNotReadyAddresses` | Publish not ready addresses | `true` | -| `perReplicaService.annotations` | Annotations for the service | `{}` | +| `perReplicaService.annotations` | Annotations for the per replica service | `{}` | | `perReplicaHeadlessService.enabled` | Enable a headless service for each sts replica | `false` | | `perReplicaHeadlessService.publishNotReadyAddresses` | Publish not ready addresses | `true` | -| `perReplicaHeadlessService.annotations` | Annotations for the headless service | `{}` | +| `perReplicaHeadlessService.annotations` | Annotations for the per replica headless service | `{}` | | `headlessservice.enabled` | Enable headless service | `true` | | `headlessservice.publishNotReadyAddresses` | Publish not ready addresses | `true` | +| `headlessservice.annotations` | Annotations for the headless service | `{}` | | `jwtSecret.enabled` | Enable a jwt secret for use with the stateless validator | `false` | | `jwtSecret.value` | Value of the jwt secret for use with the stateless validator | `""` | | `auth.enabled` | Enable auth for the stateless validator | `false` | From f3a0f63bfa09b55989f3bfb82df63cba3f69a952 Mon Sep 17 00:00:00 2001 From: chris-vest Date: Wed, 20 Nov 2024 12:00:58 +0100 Subject: [PATCH 5/6] add annotations to headless serviec --- charts/nitro/templates/headlessservice.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nitro/templates/headlessservice.yaml b/charts/nitro/templates/headlessservice.yaml index db162f5..d5dc1ad 100644 --- a/charts/nitro/templates/headlessservice.yaml +++ b/charts/nitro/templates/headlessservice.yaml @@ -6,8 +6,8 @@ metadata: labels: {{- include "nitro.labels" . | nindent 4 }} annotations: - {{- if $.Values.headless.annotations }} - {{- toYaml $.Values.headless.annotations | nindent 4 }} + {{- if $.Values.headlessservice.annotations }} + {{- toYaml $.Values.headlessservice.annotations | nindent 4 }} {{- end }} spec: type: ClusterIP From 72e8141eaf419697764376a760d5935dc3ddd185 Mon Sep 17 00:00:00 2001 From: Alec Thomas <112640918+a-thomas-22@users.noreply.github.com> Date: Thu, 26 Dec 2024 08:20:37 +0000 Subject: [PATCH 6/6] bump version --- charts/nitro/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nitro/Chart.yaml b/charts/nitro/Chart.yaml index ccca64b..8f13f7e 100644 --- a/charts/nitro/Chart.yaml +++ b/charts/nitro/Chart.yaml @@ -7,6 +7,6 @@ maintainers: type: application -version: 0.6.21 +version: 0.6.22 appVersion: "v3.2.1-d81324d"