diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0cb1cd..c1ee6c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,9 @@ variables: FRONTEND_CONTAINER_REPO: "substrate-telemetry-frontend" KUBE_NAMESPACE: "substrate-telemetry" BACKEND_IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}" + BACKEND_IMAGE_LATEST_TAG: "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:latest" FRONTEND_IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}" + FRONTEND_IMAGE_LATEST_TAG: "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:latest" stages: - dockerize @@ -25,23 +27,11 @@ stages: .deploy-k8s: &deploy-k8s image: paritytech/kubetools:3.5.3 script: - - echo "Deploying using image $BACKEND_IMAGE_FULL_NAME" - - echo "Using Helm `helm version --short`" - - export KUBERNETES_VERSION_TAG="$CI_PIPELINE_ID" - |- - sed -i "s/version:.*/version: $KUBERNETES_VERSION_TAG/" ./helm/Chart.yaml - - |- - sed -i "s/appVersion:.*/appVersion: $KUBERNETES_VERSION_TAG/" ./helm/Chart.yaml - # validate the chart - - helm template - --create-namespace - --namespace $KUBE_NAMESPACE - --set image.backend.repository="${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}" - --set image.backend.tag="${CI_COMMIT_SHORT_SHA}" - --set image.frontend.repository="${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}" - --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}" - $KUBE_NAMESPACE ./helm/ - # install the chart into the relevant cluster + echo "Deploying using image $BACKEND_IMAGE_FULL_NAME" + echo "Using Helm `helm version --short`" + helm repo add parity https://paritytech.github.io/helm-charts/ + helm repo update - helm upgrade --install --atomic @@ -52,7 +42,8 @@ stages: --set image.backend.tag="${CI_COMMIT_SHORT_SHA}" --set image.frontend.repository="${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}" --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}" - $KUBE_NAMESPACE ./helm/ + --values $HELM_VALUES_FILE + $KUBE_NAMESPACE parity/substrate-telemetry rules: - if: '$CI_COMMIT_BRANCH == "master"' when: on_success @@ -65,10 +56,13 @@ dockerize-backend: - echo "Building image $BACKEND_IMAGE_FULL_NAME" - buildah bud --format=docker - --tag "$BACKEND_IMAGE_FULL_NAME" ./backend/ + --tag "$BACKEND_IMAGE_FULL_NAME" + --tag "$BACKEND_IMAGE_LATEST_TAG" ./backend/ - echo ${Docker_Hub_Pass_Parity} | buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io - - buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME" + - |- + buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME" + buildah push --format=v2s2 "$BACKEND_IMAGE_LATEST_TAG" dockerize-frontend: <<: *dockerize @@ -76,10 +70,13 @@ dockerize-frontend: - echo "Building image $FRONTEND_IMAGE_FULL_NAME" - buildah bud --format=docker - --tag "$FRONTEND_IMAGE_FULL_NAME" ./frontend/ + --tag "$FRONTEND_IMAGE_FULL_NAME" + --tag "$FRONTEND_IMAGE_LATEST_TAG" ./frontend/ - echo ${Docker_Hub_Pass_Parity} | buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io - - buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME" + - |- + buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME" + buildah push --format=v2s2 "$FRONTEND_IMAGE_LATEST_TAG" deploy-parity-stg: stage: staging diff --git a/helm/.helmignore b/helm/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/helm/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index 44296d3..0000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: substrate-telemetry -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.1.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: "1.16.0" diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt deleted file mode 100644 index 2100821..0000000 --- a/helm/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -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.shard.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "substrate-telemetry.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.shard.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 telemetry-shard' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "substrate-telemetry.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.shard.port }} -{{- else if contains "ClusterIP" .Values.service.shard.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "substrate-telemetry.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/templates/_helpers.tpl b/helm/templates/_helpers.tpl deleted file mode 100644 index d1022e9..0000000 --- a/helm/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "substrate-telemetry.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 "substrate-telemetry.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 "substrate-telemetry.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "substrate-telemetry.labels" -}} -helm.sh/chart: {{ include "substrate-telemetry.chart" . }} -{{ include "substrate-telemetry.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "substrate-telemetry.selectorLabels" -}} -app.kubernetes.io/name: {{ include "substrate-telemetry.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "substrate-telemetry.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "substrate-telemetry.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/helm/templates/core-deployment.yaml b/helm/templates/core-deployment.yaml deleted file mode 100644 index 82da1a6..0000000 --- a/helm/templates/core-deployment.yaml +++ /dev/null @@ -1,76 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: telemetry-core - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: core -spec: - {{- if not .Values.autoscaling.core.enabled }} - replicas: {{ .Values.replicaCount.core }} - {{- end }} - selector: - matchLabels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} - telemetry-component: core - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 8 }} - telemetry-component: core - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "substrate-telemetry.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.backend.repository }}:{{ .Values.image.backend.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.backend.pullPolicy }} - {{- if .Values.envVars.core }} - env: - {{- range $key, $val := .Values.envVars.core }} - - name: {{ $key }} - value: {{ $val | quote }} - {{- end }} - {{- end }} - command: - - "telemetry_core" - args: - - "--listen" - - "0.0.0.0:{{ .Values.service.core.targetPort }}" - ports: - - name: http - containerPort: {{ .Values.service.core.targetPort }} - protocol: TCP - livenessProbe: - httpGet: - path: /health - port: http - readinessProbe: - httpGet: - path: /health - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/helm/templates/core-hpa.yaml b/helm/templates/core-hpa.yaml deleted file mode 100644 index 5e39026..0000000 --- a/helm/templates/core-hpa.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.autoscaling.core.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: telemetry-core - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: core -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: telemetry-core - minReplicas: {{ .Values.autoscaling.core.minReplicas }} - maxReplicas: {{ .Values.autoscaling.core.maxReplicas }} - metrics: - {{- if .Values.autoscaling.core.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.core.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.core.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.core.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/helm/templates/core-ingress.yaml b/helm/templates/core-ingress.yaml deleted file mode 100644 index 95b5620..0000000 --- a/helm/templates/core-ingress.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if .Values.ingress.core.enabled -}} -{{- $fullName := include "substrate-telemetry.fullname" . -}} -{{- $svcPort := .Values.service.core.port -}} -{{- if and .Values.ingress.core.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.core.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.core.annotations "kubernetes.io/ingress.class" .Values.ingress.core.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: telemetry-core - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: core - {{- with .Values.ingress.core.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.core.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.core.className }} - {{- end }} - {{- if .Values.ingress.core.tls }} - tls: - {{- range .Values.ingress.core.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.core.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: telemetry-core - port: - number: {{ $svcPort }} - {{- else }} - serviceName: telemetry-core - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/helm/templates/core-service.yaml b/helm/templates/core-service.yaml deleted file mode 100644 index c8472e2..0000000 --- a/helm/templates/core-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: telemetry-core - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: core - annotations: - {{- toYaml .Values.service.core.annotations | nindent 4 }} -spec: - type: {{ .Values.service.core.type }} - ports: - - port: {{ .Values.service.core.port }} - targetPort: {{ .Values.service.core.targetPort }} - protocol: TCP - name: http - selector: - {{- include "substrate-telemetry.selectorLabels" . | nindent 4 }} - telemetry-component: core diff --git a/helm/templates/core-servicemonitor.yaml b/helm/templates/core-servicemonitor.yaml deleted file mode 100644 index 4ae1955..0000000 --- a/helm/templates/core-servicemonitor.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.serviceMonitor.core.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: telemetry-core - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: core - {{- if .Values.serviceMonitor.core.additionalLabels }} -{{ toYaml .Values.serviceMonitor.core.additionalLabels | indent 4 }} - {{- end }} - {{- if .Values.serviceMonitor.core.annotations }} - annotations: -{{ toYaml .Values.serviceMonitor.core.annotations | indent 4 }} - {{- end }} -spec: - selector: - matchLabels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} - telemetry-component: core - namespaceSelector: - matchNames: - - {{ .Release.Namespace | quote }} - endpoints: - - port: http - {{- if .Values.serviceMonitor.core.interval }} - interval: {{ .Values.serviceMonitor.core.interval }} - {{- end }} - {{- if .Values.serviceMonitor.core.scrapeTimeout }} - scrapeTimeout: {{ .Values.serviceMonitor.core.scrapeTimeout }} - {{- end }} -{{- end }} diff --git a/helm/templates/frontend-deployment.yaml b/helm/templates/frontend-deployment.yaml deleted file mode 100644 index d036366..0000000 --- a/helm/templates/frontend-deployment.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: telemetry-frontend - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: frontend -spec: - {{- if not .Values.autoscaling.frontend.enabled }} - replicas: {{ .Values.replicaCount.frontend }} - {{- end }} - selector: - matchLabels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} - telemetry-component: frontend - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 8 }} - telemetry-component: frontend - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "substrate-telemetry.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.frontend.repository }}:{{ .Values.image.frontend.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.frontend.pullPolicy }} - {{- if .Values.envVars.frontend }} - env: - {{- range $key, $val := .Values.envVars.frontend }} - - name: {{ $key }} - value: {{ $val | quote }} - {{- end }} - {{- end }} - ports: - - name: http - containerPort: {{ .Values.service.frontend.targetPort }} - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/helm/templates/frontend-hpa.yaml b/helm/templates/frontend-hpa.yaml deleted file mode 100644 index 6546c3f..0000000 --- a/helm/templates/frontend-hpa.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.autoscaling.frontend.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: telemetry-frontend - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: frontend -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: telemetry-frontend - minReplicas: {{ .Values.autoscaling.frontend.minReplicas }} - maxReplicas: {{ .Values.autoscaling.frontend.maxReplicas }} - metrics: - {{- if .Values.autoscaling.frontend.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.frontend.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.frontend.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.frontend.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/helm/templates/frontend-ingress.yaml b/helm/templates/frontend-ingress.yaml deleted file mode 100644 index 25b82a1..0000000 --- a/helm/templates/frontend-ingress.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if .Values.ingress.frontend.enabled -}} -{{- $fullName := include "substrate-telemetry.fullname" . -}} -{{- $svcPort := .Values.service.frontend.port -}} -{{- if and .Values.ingress.frontend.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.frontend.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.frontend.annotations "kubernetes.io/ingress.class" .Values.ingress.frontend.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: telemetry-frontend - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: frontend - {{- with .Values.ingress.frontend.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.frontend.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.frontend.className }} - {{- end }} - {{- if .Values.ingress.frontend.tls }} - tls: - {{- range .Values.ingress.frontend.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.frontend.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: telemetry-frontend - port: - number: {{ $svcPort }} - {{- else }} - serviceName: telemetry-frontend - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/helm/templates/frontend-service.yaml b/helm/templates/frontend-service.yaml deleted file mode 100644 index 9083a25..0000000 --- a/helm/templates/frontend-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: telemetry-frontend - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: frontend - annotations: - {{- toYaml .Values.service.frontend.annotations | nindent 4 }} -spec: - type: {{ .Values.service.frontend.type }} - ports: - - port: {{ .Values.service.frontend.port }} - targetPort: {{ .Values.service.frontend.targetPort }} - protocol: TCP - name: http - selector: - {{- include "substrate-telemetry.selectorLabels" . | nindent 4 }} - telemetry-component: frontend diff --git a/helm/templates/serviceaccount.yaml b/helm/templates/serviceaccount.yaml deleted file mode 100644 index a6a6722..0000000 --- a/helm/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "substrate-telemetry.serviceAccountName" . }} - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/helm/templates/shard-deployment.yaml b/helm/templates/shard-deployment.yaml deleted file mode 100644 index 8803635..0000000 --- a/helm/templates/shard-deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: telemetry-shard - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: shard -spec: - {{- if not .Values.autoscaling.shard.enabled }} - replicas: {{ .Values.replicaCount.shard }} - {{- end }} - selector: - matchLabels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} - telemetry-component: shard - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "substrate-telemetry.selectorLabels" . | nindent 8 }} - telemetry-component: shard - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "substrate-telemetry.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.backend.repository }}:{{ .Values.image.backend.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.backend.pullPolicy }} - {{- if .Values.envVars.shard }} - env: - {{- range $key, $val := .Values.envVars.shard }} - - name: {{ $key }} - value: {{ $val | quote }} - {{- end }} - {{- end }} - command: - - "telemetry_shard" - args: - - "--listen" - - "0.0.0.0:{{ .Values.service.shard.targetPort }}" - - "--core" - - "http://telemetry-core:{{ .Values.service.core.port }}/shard_submit" - ports: - - name: http - containerPort: {{ .Values.service.shard.targetPort }} - protocol: TCP - livenessProbe: - httpGet: - path: /health - port: http - readinessProbe: - httpGet: - path: /health - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/helm/templates/shard-hpa.yaml b/helm/templates/shard-hpa.yaml deleted file mode 100644 index ff674c4..0000000 --- a/helm/templates/shard-hpa.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.autoscaling.shard.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: telemetry-shard - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: shard -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: telemetry-shard - minReplicas: {{ .Values.autoscaling.shard.minReplicas }} - maxReplicas: {{ .Values.autoscaling.shard.maxReplicas }} - metrics: - {{- if .Values.autoscaling.shard.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.shard.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.shard.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.shard.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/helm/templates/shard-service.yaml b/helm/templates/shard-service.yaml deleted file mode 100644 index 1149f84..0000000 --- a/helm/templates/shard-service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: telemetry-shard - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - telemetry-component: shard - annotations: - {{- toYaml .Values.service.shard.annotations | nindent 4 }} - -spec: - type: {{ .Values.service.shard.type }} - ports: - - port: {{ .Values.service.shard.port }} - targetPort: {{ .Values.service.shard.targetPort }} - protocol: TCP - name: http - selector: - {{- include "substrate-telemetry.selectorLabels" . | nindent 4 }} - telemetry-component: shard diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index 3899a38..0000000 --- a/helm/values.yaml +++ /dev/null @@ -1,204 +0,0 @@ -# Default values for substrate-telemtry. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: - shard: 3 - core: 1 - frontend: 1 - -image: - backend: - repository: docker.io/parity/substrate-telemetry-backend - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: f089ad17 - frontend: - repository: docker.io/parity/substrate-telemetry-frontend - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: f089ad17 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -envVars: - shard: {} - core: {} - frontend: - # The frontend docker container makes this available to the UI, - # so that it knows where to look for feed information: - SUBSTRATE_TELEMETRY_URL: wss://feed.telemetry.parity-stg.parity.io/feed - -serviceMonitor: - shard: - enabled: false - interval: "" - additionalLabels: {} - annotations: {} - # scrapeTimeout: 10s - core: - enabled: true - interval: "" - additionalLabels: {} - annotations: {} - # scrapeTimeout: 10s - frontend: - enabled: false - interval: "" - additionalLabels: {} - annotations: {} - # scrapeTimeout: 10s - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - shard: - type: LoadBalancer - port: 80 - targetPort: 8000 - annotations: - external-dns.alpha.kubernetes.io/hostname: submit.telemetry.parity-stg.parity.io. - core: - type: ClusterIP - port: 80 - targetPort: 8000 - annotations: {} - # cloud.google.com/load-balancer-type: Internal - # networking.gke.io/internal-load-balancer-allow-global-access: "true" - # external-dns.alpha.kubernetes.io/hostname: feed.telemetry.parity-stg.parity.io. - frontend: - type: ClusterIP - port: 80 - targetPort: 8000 - annotations: {} - -ingress: - shard: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - core: - enabled: true - className: "" - annotations: - kubernetes.io/ingress.class: traefik-internal - traefik.ingress.kubernetes.io/router.entrypoints: web,websecure - cert-manager.io/cluster-issuer: letsencrypt-dns01 - external-dns.alpha.kubernetes.io/target: traefik-internal.parity-stg.parity.io. - traefik.ingress.kubernetes.io/router.tls: "true" - hosts: - - host: feed.telemetry.parity-stg.parity.io - paths: - - path: / - pathType: ImplementationSpecific - tls: - - secretName: feed.telemetry.parity-stg.parity.io - hosts: - - feed.telemetry.parity-stg.parity.io - frontend: - enabled: true - #className: "traefik-internal" - annotations: - kubernetes.io/ingress.class: traefik-internal - traefik.ingress.kubernetes.io/router.entrypoints: web,websecure - cert-manager.io/cluster-issuer: letsencrypt-dns01 - external-dns.alpha.kubernetes.io/target: traefik-internal.parity-stg.parity.io. - traefik.ingress.kubernetes.io/router.tls: "true" - hosts: - - host: telemetry.parity-stg.parity.io - paths: - - path: / - pathType: ImplementationSpecific - tls: - - secretName: telemetry.parity-stg.parity.io - hosts: - - telemetry.parity-stg.parity.io - - - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - shard: - enabled: true - minReplicas: 2 - maxReplicas: 6 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - # telemetry-core is not scalable atm. - core: - enabled: false - minReplicas: 3 - maxReplicas: 6 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - frontend: - enabled: false - minReplicas: 1 - maxReplicas: 6 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - - -nodeSelector: {} - - -affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: cloud.google.com/gke-nodepool - operator: In - values: - - substrate-telemetry-pool - -tolerations: -- key: "app" - operator: "Equal" - value: "substrate-telemetry" - effect: "NoExecute" -