diff --git a/charts/evm-faucet/Chart.yaml b/charts/evm-faucet/Chart.yaml index 88ca092515..dff2ef7506 100644 --- a/charts/evm-faucet/Chart.yaml +++ b/charts/evm-faucet/Chart.yaml @@ -16,7 +16,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/evm-faucet/templates/_helper.tpl b/charts/evm-faucet/templates/_helper.tpl index 6ac61d91da..639b02d707 100644 --- a/charts/evm-faucet/templates/_helper.tpl +++ b/charts/evm-faucet/templates/_helper.tpl @@ -38,3 +38,15 @@ Return the appropriate apiVersion for ingress. {{- print "extensions/v1beta1" }} {{- end }} {{- end }} + +{{/* +Service annotations +*/}} +{{- define "evmFaucet.serviceAnnotations" }} +{{- if .Values.additionalAnnotations }} +{{ toYaml .Values.additionalAnnotations }} +{{- end }} +{{- if .Values.service.annotations }} +{{ toYaml .Values.service.annotations }} +{{- end }} +{{- end }} diff --git a/charts/evm-faucet/templates/service.yaml b/charts/evm-faucet/templates/service.yaml index c994fd66de..bdc1a0c6c4 100644 --- a/charts/evm-faucet/templates/service.yaml +++ b/charts/evm-faucet/templates/service.yaml @@ -3,6 +3,10 @@ apiVersion: v1 metadata: name: {{tpl .Values.config.rollupName . }}-evm-faucet-service namespace: {{ include "evmFaucet.namespace" . }} + {{- if or .Values.additionalAnnotations .Values.service.annotations }} + annotations: + {{- include "evmFaucet.serviceAnnotations" . | indent 4 }} + {{- end }} spec: selector: app: {{tpl .Values.config.rollupName . }}-evm-faucet diff --git a/charts/evm-faucet/values.yaml b/charts/evm-faucet/values.yaml index 6ec6c892c2..b79100f424 100644 --- a/charts/evm-faucet/values.yaml +++ b/charts/evm-faucet/values.yaml @@ -58,3 +58,6 @@ secretProvider: ports: faucet: 8080 + +service: + annotations: {} diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 142c15567e..a1fab2d482 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -10,7 +10,7 @@ dependencies: version: 1.0.0 - name: evm-faucet repository: file://../evm-faucet - version: 0.1.2 + version: 0.1.3 - name: evm-bridge-withdrawer repository: file://../evm-bridge-withdrawer version: 1.0.1 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.8 -digest: sha256:618d0978ce1fa169bffa360010e8afeb06f21ffb7574e8a298d1d561bbcee05b -generated: "2024-11-11T13:27:42.868678+02:00" +digest: sha256:037f984f43d4eb0616c27f8a36a359680d4d745f4687a4ca54f7d77fb5119d99 +generated: "2024-12-11T11:48:47.334728-08:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index 990a8c4c53..e0df534b99 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 dependencies: - name: celestia-node @@ -30,7 +30,7 @@ dependencies: repository: "file://../composer" condition: composer.enabled - name: evm-faucet - version: 0.1.2 + version: 0.1.3 repository: "file://../evm-faucet" condition: evm-faucet.enabled - name: evm-bridge-withdrawer diff --git a/charts/graph-node/Chart.yaml b/charts/graph-node/Chart.yaml index 5a866a2b8b..0a58aad89c 100644 --- a/charts/graph-node/Chart.yaml +++ b/charts/graph-node/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: graph-node description: A Helm chart for Graph Node deployment -version: 0.2.0 +version: 0.2.1 appVersion: "0.0.1" maintainers: diff --git a/charts/graph-node/templates/_helpers.tpl b/charts/graph-node/templates/_helpers.tpl index c6aba56008..d0830293a7 100644 --- a/charts/graph-node/templates/_helpers.tpl +++ b/charts/graph-node/templates/_helpers.tpl @@ -12,3 +12,24 @@ Namepsace to deploy elements into. {{- define "graphnode.namespace" -}} {{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}} {{- end }} + +{{/* +Service annotations +*/}} +{{- define "graphNode.serviceAnnotations" }} +{{- if .Values.graphNode.additionalAnnotations }} +{{ toYaml .Values.graphNode.additionalAnnotations }} +{{- end }} +{{- if .Values.graphNode.service.annotations }} +{{ toYaml .Values.graphNode.service.annotations }} +{{- end }} +{{- end }} + +{{- define "ipfs.serviceAnnotations" }} +{{- if .Values.ipfs.additionalAnnotations }} +{{ toYaml .Values.ipfs.additionalAnnotations }} +{{- end }} +{{- if .Values.ipfs.service.annotations }} +{{ toYaml .Values.ipfs.service.annotations }} +{{- end }} +{{- end }} diff --git a/charts/graph-node/templates/services.yaml b/charts/graph-node/templates/services.yaml index 54613bd4ae..46dec74ce7 100644 --- a/charts/graph-node/templates/services.yaml +++ b/charts/graph-node/templates/services.yaml @@ -3,6 +3,10 @@ kind: Service metadata: name: graph-node namespace: {{ include "graphnode.namespace" . }} + {{- if or .Values.graphNode.additionalAnnotations .Values.graphNode.service.annotations }} + annotations: + {{- include "graphNode.serviceAnnotations" . | indent 4 }} + {{- end }} spec: selector: app: graph-node @@ -28,6 +32,10 @@ kind: Service metadata: name: ipfs namespace: {{ include "graphnode.namespace" . }} + {{- if or .Values.ipfs.additionalAnnotations .Values.ipfs.service.annotations }} + annotations: + {{- include "ipfs.serviceAnnotations" . | indent 4 }} + {{- end }} spec: selector: app: ipfs diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index 1fcb3146ea..d9572bcfdc 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -14,6 +14,8 @@ graphNode: replicas: 1 metrics: enabled: false + service: + annotations: {} ports: http: 8000 jsonRpc: 8001 @@ -41,6 +43,8 @@ ipfs: enabled: false local: true size: 5Gi + service: + annotations: {} ports: api: 5001 diff --git a/charts/sequencer-faucet/Chart.yaml b/charts/sequencer-faucet/Chart.yaml index 7aaa81d9fe..1e985b6b5e 100644 --- a/charts/sequencer-faucet/Chart.yaml +++ b/charts/sequencer-faucet/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.0 +version: 0.9.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.9.0" +appVersion: "0.9.1" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer-faucet/templates/_helpers.tpl b/charts/sequencer-faucet/templates/_helpers.tpl index df67bd2833..a09b945424 100644 --- a/charts/sequencer-faucet/templates/_helpers.tpl +++ b/charts/sequencer-faucet/templates/_helpers.tpl @@ -29,4 +29,16 @@ Return the appropriate apiVersion for ingress. {{- else }} {{- print "extensions/v1beta1" }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} + +{{/* +Service annotations +*/}} +{{- define "sequencer.serviceAnnotations" }} +{{- if .Values.additionalAnnotations }} +{{ toYaml .Values.additionalAnnotations }} +{{- end }} +{{- if .Values.service.annotations }} +{{ toYaml .Values.service.annotations }} +{{- end }} +{{- end }} diff --git a/charts/sequencer-faucet/templates/service.yaml b/charts/sequencer-faucet/templates/service.yaml index 56afcaa0c4..7dcc7e6d2c 100644 --- a/charts/sequencer-faucet/templates/service.yaml +++ b/charts/sequencer-faucet/templates/service.yaml @@ -3,6 +3,10 @@ apiVersion: v1 metadata: name: sequencer-faucet-service namespace: {{ .Values.global.namespace }} + {{- if or .Values.additionalAnnotations .Values.service.annotations }} + annotations: + {{- include "sequencer.serviceAnnotations" . | indent 4 }} + {{- end }} spec: selector: app: astria-dev-cluster diff --git a/charts/sequencer-faucet/values.yaml b/charts/sequencer-faucet/values.yaml index 0de9bdaaa7..ed31a06c44 100644 --- a/charts/sequencer-faucet/values.yaml +++ b/charts/sequencer-faucet/values.yaml @@ -55,6 +55,9 @@ secretProvider: ports: faucet: 8080 +service: + annotations: {} + ingress: enabled: true # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName