From 80d21532b38dbd7e8091300a3447773edd15cf0d Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 24 Apr 2024 06:51:32 -0400 Subject: [PATCH 1/3] Adjust deployment one more time (#42) --- helm/fuel-subgraph/templates/deployment.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/helm/fuel-subgraph/templates/deployment.yaml b/helm/fuel-subgraph/templates/deployment.yaml index fcd6c83..bf48814 100644 --- a/helm/fuel-subgraph/templates/deployment.yaml +++ b/helm/fuel-subgraph/templates/deployment.yaml @@ -33,14 +33,7 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - command: [ "./fuel-subgraph" ] - args: - - "--host" - - "0.0.0.0" - - "--port" - - "8080" - - "--db-path" - - "/mnt/db/db.db3" + command: [ "./app/start.sh" ] ports: - name: http containerPort: {{ .Values.service.port }} From b57e3c9854decc519fd3c1f0997d40bd38317ce9 Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:53:32 -0400 Subject: [PATCH 2/3] Add Chart.yaml back (#43) --- helm/fuel-subgraph/Chart.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 helm/fuel-subgraph/Chart.yaml diff --git a/helm/fuel-subgraph/Chart.yaml b/helm/fuel-subgraph/Chart.yaml new file mode 100644 index 0000000..d2eb87b --- /dev/null +++ b/helm/fuel-subgraph/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: fuel-subgraph +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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.2.0 + +# 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.1.2" From bd15b3ee5b691ca6fc887617e4564580d871f78d Mon Sep 17 00:00:00 2001 From: roy_fuel <96140895+rfuelsh@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:14:29 -0400 Subject: [PATCH 3/3] Adding back deleted helm files (#44) --- helm/fuel-subgraph/Chart.yaml | 2 +- helm/fuel-subgraph/templates/NOTES.txt | 22 +++++++ helm/fuel-subgraph/templates/_helpers.tpl | 62 +++++++++++++++++++ helm/fuel-subgraph/templates/hpa.yaml | 32 ++++++++++ helm/fuel-subgraph/templates/ingress.yaml | 61 ++++++++++++++++++ .../templates/serviceaccount.yaml | 12 ++++ 6 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 helm/fuel-subgraph/templates/NOTES.txt create mode 100644 helm/fuel-subgraph/templates/_helpers.tpl create mode 100644 helm/fuel-subgraph/templates/hpa.yaml create mode 100644 helm/fuel-subgraph/templates/ingress.yaml create mode 100644 helm/fuel-subgraph/templates/serviceaccount.yaml diff --git a/helm/fuel-subgraph/Chart.yaml b/helm/fuel-subgraph/Chart.yaml index d2eb87b..f740cfd 100644 --- a/helm/fuel-subgraph/Chart.yaml +++ b/helm/fuel-subgraph/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: 0.2.0 +version: 0.2.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 diff --git a/helm/fuel-subgraph/templates/NOTES.txt b/helm/fuel-subgraph/templates/NOTES.txt new file mode 100644 index 0000000..be626e1 --- /dev/null +++ b/helm/fuel-subgraph/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "fuel-subgraph.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "fuel-subgraph.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "fuel-subgraph.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "fuel-subgraph.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/helm/fuel-subgraph/templates/_helpers.tpl b/helm/fuel-subgraph/templates/_helpers.tpl new file mode 100644 index 0000000..3c77a22 --- /dev/null +++ b/helm/fuel-subgraph/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "fuel-subgraph.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "fuel-subgraph.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "fuel-subgraph.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "fuel-subgraph.labels" -}} +helm.sh/chart: {{ include "fuel-subgraph.chart" . }} +{{ include "fuel-subgraph.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "fuel-subgraph.selectorLabels" -}} +app.kubernetes.io/name: {{ include "fuel-subgraph.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "fuel-subgraph.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "fuel-subgraph.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm/fuel-subgraph/templates/hpa.yaml b/helm/fuel-subgraph/templates/hpa.yaml new file mode 100644 index 0000000..4e0d5e2 --- /dev/null +++ b/helm/fuel-subgraph/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "fuel-subgraph.fullname" . }} + labels: + {{- include "fuel-subgraph.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "fuel-subgraph.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm/fuel-subgraph/templates/ingress.yaml b/helm/fuel-subgraph/templates/ingress.yaml new file mode 100644 index 0000000..a969071 --- /dev/null +++ b/helm/fuel-subgraph/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "fuel-subgraph.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "fuel-subgraph.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/helm/fuel-subgraph/templates/serviceaccount.yaml b/helm/fuel-subgraph/templates/serviceaccount.yaml new file mode 100644 index 0000000..7ae46c1 --- /dev/null +++ b/helm/fuel-subgraph/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "fuel-subgraph.serviceAccountName" . }} + labels: + {{- include "fuel-subgraph.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }}