From 11972e3dc4805d43f113ef391c5be1581d8cd97a Mon Sep 17 00:00:00 2001 From: arshamparity Date: Mon, 26 Jul 2021 15:21:27 +0300 Subject: [PATCH 01/11] adding helm chart and configuring CI --- .gitlab-ci.yml | 64 +++++++++++++++ helm/.helmignore | 23 ++++++ helm/Chart.yaml | 24 ++++++ helm/templates/NOTES.txt | 22 +++++ helm/templates/_helpers.tpl | 62 +++++++++++++++ helm/templates/deployment.yaml | 61 ++++++++++++++ helm/templates/hpa.yaml | 28 +++++++ helm/templates/ingress.yaml | 61 ++++++++++++++ helm/templates/service.yaml | 15 ++++ helm/templates/serviceaccount.yaml | 12 +++ helm/templates/tests/test-connection.yaml | 15 ++++ helm/values.yaml | 97 +++++++++++++++++++++++ 12 files changed, 484 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 helm/.helmignore create mode 100644 helm/Chart.yaml create mode 100644 helm/templates/NOTES.txt create mode 100644 helm/templates/_helpers.tpl create mode 100644 helm/templates/deployment.yaml create mode 100644 helm/templates/hpa.yaml create mode 100644 helm/templates/ingress.yaml create mode 100644 helm/templates/service.yaml create mode 100644 helm/templates/serviceaccount.yaml create mode 100644 helm/templates/tests/test-connection.yaml create mode 100644 helm/values.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..57f0687 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,64 @@ +variables: + CONTAINER_REGISTRY: "docker.io/parity" + KUBE_NAMESPACE: "substrate-telemetry" + IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + +stages: + - dockerize + - staging + +#.delete_deployment: &delete_deployment +# - helm uninstall -n "$KUBE_NAMESPACE" "$KUBE_NAMESPACE" + +.deploy-k8s: &deploy-k8s + image: paritytech/kubetools:3.5.3 + script: + - echo "Deploying using image $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 --debug template + --create-namespace + --namespace $KUBE_NAMESPACE + --set image.repository="${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}" + --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + $KUBE_NAMESPACE ./helm/ + # install the chart into the relevant cluster + - helm --debug upgrade + --install + --atomic + --timeout 120s + --create-namespace + --namespace $KUBE_NAMESPACE + --set image.repository="${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}" + --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + $KUBE_NAMESPACE ./helm/ + when: manual + tags: + - kubernetes-parity-build + +dockerize: + stage: dockerize + image: quay.io/buildah/stable + script: + - echo "Building image $IMAGE_FULL_NAME" + - buildah bud + --format=docker + --tag "$IMAGE_FULL_NAME" ./backend/ + - echo ${Docker_Hub_Pass_Parity} | + buildah login --username ${Docker_Hub_User_Parity} --password-stdin ${CONTAINER_REGISTRY} + - buildah push --format=v2s2 "$IMAGE_FULL_NAME" + tags: + - kubernetes-parity-build + +deploy-parity-stg: + stage: staging + <<: *deploy-k8s + environment: + name: parity-stg + rules: + - if: '$CI_COMMIT_BRANCH == "master"' diff --git a/helm/.helmignore b/helm/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/helm/.helmignore @@ -0,0 +1,23 @@ +# 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 new file mode 100644 index 0000000..44296d3 --- /dev/null +++ b/helm/Chart.yaml @@ -0,0 +1,24 @@ +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 new file mode 100644 index 0000000..dc2cac5 --- /dev/null +++ b/helm/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 "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.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 "substrate-telemetry.fullname" . }}' + 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.port }} +{{- else if contains "ClusterIP" .Values.service.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 new file mode 100644 index 0000000..d1022e9 --- /dev/null +++ b/helm/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +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/deployment.yaml b/helm/templates/deployment.yaml new file mode 100644 index 0000000..04a1205 --- /dev/null +++ b/helm/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "substrate-telemetry.fullname" . }} + labels: + {{- include "substrate-telemetry.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "substrate-telemetry.selectorLabels" . | nindent 8 }} + 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.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.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/hpa.yaml b/helm/templates/hpa.yaml new file mode 100644 index 0000000..eb860dd --- /dev/null +++ b/helm/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "substrate-telemetry.fullname" . }} + labels: + {{- include "substrate-telemetry.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "substrate-telemetry.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml new file mode 100644 index 0000000..30dc97e --- /dev/null +++ b/helm/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "substrate-telemetry.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 "substrate-telemetry.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/templates/service.yaml b/helm/templates/service.yaml new file mode 100644 index 0000000..2ddb528 --- /dev/null +++ b/helm/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "substrate-telemetry.fullname" . }} + labels: + {{- include "substrate-telemetry.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: {{ .Values.service.targetPort }} + protocol: TCP + name: http + selector: + {{- include "substrate-telemetry.selectorLabels" . | nindent 4 }} diff --git a/helm/templates/serviceaccount.yaml b/helm/templates/serviceaccount.yaml new file mode 100644 index 0000000..a6a6722 --- /dev/null +++ b/helm/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- 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/tests/test-connection.yaml b/helm/templates/tests/test-connection.yaml new file mode 100644 index 0000000..a09cc32 --- /dev/null +++ b/helm/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "substrate-telemetry.fullname" . }}-test-connection" + labels: + {{- include "substrate-telemetry.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "substrate-telemetry.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 0000000..0b6c7f9 --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,97 @@ +# Default values for substrate-telemtry. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 4 + +image: + repository: parity/substrate-telemetry-backend + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: latest + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +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: + type: LoadBalancer + port: 80 + targetPort: 3000 + +ingress: + 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 + +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: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + + +affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: cloud.google.com/gke-nodepool + operator: In + values: + - substrate-telemetry + +tolerations: +- key: "app" + operator: "Equal" + value: "substrate-telemetry" + effect: "NoExecute" + From e7a7a7b237a0a302b7c4ff22f7b72ace8a460635 Mon Sep 17 00:00:00 2001 From: arshamparity Date: Tue, 27 Jul 2021 10:43:23 +0300 Subject: [PATCH 02/11] fixing ci and replicas --- .gitlab-ci.yml | 5 +++-- helm/values.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57f0687..a4c47ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,5 +60,6 @@ deploy-parity-stg: <<: *deploy-k8s environment: name: parity-stg - rules: - - if: '$CI_COMMIT_BRANCH == "master"' +# rules: +# - if: '$CI_COMMIT_BRANCH == "master"' + diff --git a/helm/values.yaml b/helm/values.yaml index 0b6c7f9..854e8ad 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -2,7 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 4 +replicaCount: 3 image: repository: parity/substrate-telemetry-backend From 3802c75830a810672bb4d5eb5678039699e5ffca Mon Sep 17 00:00:00 2001 From: arshamparity Date: Tue, 27 Jul 2021 11:39:26 +0300 Subject: [PATCH 03/11] fixing CI --- .gitlab-ci.yml | 9 +++++---- backend/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4c47ed..6e2fa62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ variables: CONTAINER_REGISTRY: "docker.io/parity" + CONTAINER_REPO: "substrate-telemetry-backend" KUBE_NAMESPACE: "substrate-telemetry" - IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${CONTAINER_REPO}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" stages: - dockerize @@ -24,7 +25,7 @@ stages: - helm --debug template --create-namespace --namespace $KUBE_NAMESPACE - --set image.repository="${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}" + --set image.repository="${CONTAINER_REGISTRY}/${CONTAINER_REPO}" --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ # install the chart into the relevant cluster @@ -34,7 +35,7 @@ stages: --timeout 120s --create-namespace --namespace $KUBE_NAMESPACE - --set image.repository="${CONTAINER_REGISTRY}/${KUBE_NAMESPACE}" + --set image.repository="${CONTAINER_REGISTRY}/${CONTAINER_REPO}" --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ when: manual @@ -50,7 +51,7 @@ dockerize: --format=docker --tag "$IMAGE_FULL_NAME" ./backend/ - echo ${Docker_Hub_Pass_Parity} | - buildah login --username ${Docker_Hub_User_Parity} --password-stdin ${CONTAINER_REGISTRY} + buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io - buildah push --format=v2s2 "$IMAGE_FULL_NAME" tags: - kubernetes-parity-build diff --git a/backend/Dockerfile b/backend/Dockerfile index a19f453..52b5760 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM paritytech/ci-linux:production as builder +FROM docker.io/paritytech/ci-linux:production as builder ARG PROFILE=release WORKDIR /app @@ -8,7 +8,7 @@ COPY . . RUN cargo build --${PROFILE} --bins # MAIN IMAGE FOR PEOPLE TO PULL --- small one# -FROM debian:buster-slim +FROM docker.io/debian:buster-slim LABEL maintainer="Parity Technologies" LABEL description="Polkadot Telemetry backend, static build" From 99a3c474b9da1b3739659ca57d0fba7e2caa19b2 Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 13:18:28 +0300 Subject: [PATCH 04/11] deploying the shard alongside the core --- helm/templates/NOTES.txt | 10 +-- .../{deployment.yaml => core-deployment.yaml} | 13 +++- helm/templates/core-service.yaml | 19 +++++ helm/templates/service.yaml | 15 ---- helm/templates/shard-deployment.yaml | 70 +++++++++++++++++++ helm/templates/shard-service.yaml | 20 ++++++ helm/values.yaml | 21 ++++-- 7 files changed, 141 insertions(+), 27 deletions(-) rename helm/templates/{deployment.yaml => core-deployment.yaml} (84%) create mode 100644 helm/templates/core-service.yaml delete mode 100644 helm/templates/service.yaml create mode 100644 helm/templates/shard-deployment.yaml create mode 100644 helm/templates/shard-service.yaml diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index dc2cac5..2100821 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -5,16 +5,16 @@ http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} {{- end }} {{- end }} -{{- else if contains "NodePort" .Values.service.type }} +{{- 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.type }} +{{- 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 {{ include "substrate-telemetry.fullname" . }}' + 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.port }} -{{- else if contains "ClusterIP" .Values.service.type }} + 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" diff --git a/helm/templates/deployment.yaml b/helm/templates/core-deployment.yaml similarity index 84% rename from helm/templates/deployment.yaml rename to helm/templates/core-deployment.yaml index 04a1205..e49eda4 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/core-deployment.yaml @@ -1,12 +1,13 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "substrate-telemetry.fullname" . }} + name: telemetry-core labels: {{- include "substrate-telemetry.labels" . | nindent 4 }} + telemetry-component: core spec: {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.replicaCount.core }} {{- end }} selector: matchLabels: @@ -19,6 +20,7 @@ spec: {{- end }} labels: {{- include "substrate-telemetry.selectorLabels" . | nindent 8 }} + telemetry-component: core spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -33,9 +35,14 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + command: + - "telemetry_core" + args: + - "--listen" + - "0.0.0.0:8000" ports: - name: http - containerPort: {{ .Values.service.targetPort }} + containerPort: {{ .Values.service.core.targetPort }} protocol: TCP #livenessProbe: # httpGet: diff --git a/helm/templates/core-service.yaml b/helm/templates/core-service.yaml new file mode 100644 index 0000000..c8472e2 --- /dev/null +++ b/helm/templates/core-service.yaml @@ -0,0 +1,19 @@ +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/service.yaml b/helm/templates/service.yaml deleted file mode 100644 index 2ddb528..0000000 --- a/helm/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "substrate-telemetry.fullname" . }} - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP - name: http - selector: - {{- include "substrate-telemetry.selectorLabels" . | nindent 4 }} diff --git a/helm/templates/shard-deployment.yaml b/helm/templates/shard-deployment.yaml new file mode 100644 index 0000000..c293721 --- /dev/null +++ b/helm/templates/shard-deployment.yaml @@ -0,0 +1,70 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: telemetry-shard + labels: + {{- include "substrate-telemetry.labels" . | nindent 4 }} + telemetry-component: shard +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount.shard }} + {{- end }} + selector: + matchLabels: + {{- include "substrate-telemetry.selectorLabels" . | nindent 6 }} + 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.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + command: + - "telemetry_shard" + args: + - "--listen" + - "0.0.0.0:8000" + - "--core" + - "http://telemetry-core/shard_submit" + ports: + - name: http + containerPort: {{ .Values.service.shard.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/shard-service.yaml b/helm/templates/shard-service.yaml new file mode 100644 index 0000000..1149f84 --- /dev/null +++ b/helm/templates/shard-service.yaml @@ -0,0 +1,20 @@ +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 index 854e8ad..bf6ec7c 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -2,7 +2,9 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 3 +replicaCount: + shard: 3 + core: 1 image: repository: parity/substrate-telemetry-backend @@ -37,9 +39,20 @@ securityContext: {} # runAsUser: 1000 service: - type: LoadBalancer - port: 80 - targetPort: 3000 + shard: + type: LoadBalancer + 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: substrate-telemetry.parity-stg.parity.io. + core: + type: ClusterIP + port: 80 + targetPort: 8000 + annotations: {} + ingress: enabled: false From fff38c1f38b133579d2d2235e418144c06f88fd6 Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 15:23:04 +0300 Subject: [PATCH 05/11] change affinity rules --- helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/values.yaml b/helm/values.yaml index bf6ec7c..3689ca7 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -100,7 +100,7 @@ affinity: - key: cloud.google.com/gke-nodepool operator: In values: - - substrate-telemetry + - substrate-telemetry-pool tolerations: - key: "app" From cbca6a097402c46c28c72e4bd1905410e40439dd Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 16:17:39 +0300 Subject: [PATCH 06/11] change the ci --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e2fa62..e907064 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,9 @@ stages: --set image.repository="${CONTAINER_REGISTRY}/${CONTAINER_REPO}" --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ - when: manual + rules: + - if: '$CI_COMMIT_BRANCH == "jsdw-sharding"' + when: manual tags: - kubernetes-parity-build @@ -61,6 +63,3 @@ deploy-parity-stg: <<: *deploy-k8s environment: name: parity-stg -# rules: -# - if: '$CI_COMMIT_BRANCH == "master"' - From d46e28e58016c3fe729de5576136a46108243970 Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 16:22:48 +0300 Subject: [PATCH 07/11] change the image tag --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e907064..5dd8f87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: CONTAINER_REGISTRY: "docker.io/parity" CONTAINER_REPO: "substrate-telemetry-backend" KUBE_NAMESPACE: "substrate-telemetry" - IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${CONTAINER_REPO}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + IMAGE_FULL_NAME: "${CONTAINER_REGISTRY}/${CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}" stages: - dockerize @@ -26,7 +26,7 @@ stages: --create-namespace --namespace $KUBE_NAMESPACE --set image.repository="${CONTAINER_REGISTRY}/${CONTAINER_REPO}" - --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + --set image.tag="${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ # install the chart into the relevant cluster - helm --debug upgrade @@ -36,7 +36,7 @@ stages: --create-namespace --namespace $KUBE_NAMESPACE --set image.repository="${CONTAINER_REGISTRY}/${CONTAINER_REPO}" - --set image.tag="${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + --set image.tag="${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ rules: - if: '$CI_COMMIT_BRANCH == "jsdw-sharding"' From a0c434f238983249efce879081f71b40e7066e9d Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 16:37:00 +0300 Subject: [PATCH 08/11] set pipeline to manual --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dd8f87..9cefa99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,9 @@ dockerize: - echo ${Docker_Hub_Pass_Parity} | buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io - buildah push --format=v2s2 "$IMAGE_FULL_NAME" + rules: + - if: '$CI_COMMIT_BRANCH == "jsdw-sharding"' + when: manual tags: - kubernetes-parity-build From 4e5815ced9797b61e329752f49cfa528004e1c32 Mon Sep 17 00:00:00 2001 From: arshamparity Date: Wed, 28 Jul 2021 17:56:24 +0300 Subject: [PATCH 09/11] adding liveness and rediness probes --- helm/templates/core-deployment.yaml | 16 ++++++++-------- helm/templates/shard-deployment.yaml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/helm/templates/core-deployment.yaml b/helm/templates/core-deployment.yaml index e49eda4..87986b2 100644 --- a/helm/templates/core-deployment.yaml +++ b/helm/templates/core-deployment.yaml @@ -44,14 +44,14 @@ spec: - name: http containerPort: {{ .Values.service.core.targetPort }} protocol: TCP - #livenessProbe: - # httpGet: - # path: / - # port: http - #readinessProbe: - # httpGet: - # path: / - # port: http + livenessProbe: + httpGet: + path: /health + port: http + readinessProbe: + httpGet: + path: /health + port: http resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/helm/templates/shard-deployment.yaml b/helm/templates/shard-deployment.yaml index c293721..04dba58 100644 --- a/helm/templates/shard-deployment.yaml +++ b/helm/templates/shard-deployment.yaml @@ -46,14 +46,14 @@ spec: - name: http containerPort: {{ .Values.service.shard.targetPort }} protocol: TCP - #livenessProbe: - # httpGet: - # path: / - # port: http - #readinessProbe: - # httpGet: - # path: / - # port: http + livenessProbe: + httpGet: + path: /health + port: http + readinessProbe: + httpGet: + path: /health + port: http resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} From 55537af6f5db33fb833acf232ed76bc036355912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsham=20Teymour=C4=B1?= Date: Mon, 2 Aug 2021 12:00:42 +0300 Subject: [PATCH 10/11] extending the helm chart exposing telemetry core service adding hpa support for telemetry shard --- helm/templates/core-deployment.yaml | 2 +- helm/templates/shard-deployment.yaml | 4 +-- helm/templates/{hpa.yaml => shard-hpa.yaml} | 5 ++-- helm/templates/tests/test-connection.yaml | 15 ----------- helm/values.yaml | 29 ++++++++++++++------- 5 files changed, 26 insertions(+), 29 deletions(-) rename helm/templates/{hpa.yaml => shard-hpa.yaml} (88%) delete mode 100644 helm/templates/tests/test-connection.yaml diff --git a/helm/templates/core-deployment.yaml b/helm/templates/core-deployment.yaml index 87986b2..d4c47b0 100644 --- a/helm/templates/core-deployment.yaml +++ b/helm/templates/core-deployment.yaml @@ -39,7 +39,7 @@ spec: - "telemetry_core" args: - "--listen" - - "0.0.0.0:8000" + - "0.0.0.0:{{ .Values.service.core.targetPort }}" ports: - name: http containerPort: {{ .Values.service.core.targetPort }} diff --git a/helm/templates/shard-deployment.yaml b/helm/templates/shard-deployment.yaml index 04dba58..0b73dba 100644 --- a/helm/templates/shard-deployment.yaml +++ b/helm/templates/shard-deployment.yaml @@ -39,9 +39,9 @@ spec: - "telemetry_shard" args: - "--listen" - - "0.0.0.0:8000" + - "0.0.0.0:{{ .Values.service.shard.targetPort }}" - "--core" - - "http://telemetry-core/shard_submit" + - "http://telemetry-core:{{ .Values.service.core.targetPort }}/shard_submit" ports: - name: http containerPort: {{ .Values.service.shard.targetPort }} diff --git a/helm/templates/hpa.yaml b/helm/templates/shard-hpa.yaml similarity index 88% rename from helm/templates/hpa.yaml rename to helm/templates/shard-hpa.yaml index eb860dd..eabbced 100644 --- a/helm/templates/hpa.yaml +++ b/helm/templates/shard-hpa.yaml @@ -2,14 +2,15 @@ apiVersion: autoscaling/v2beta1 kind: HorizontalPodAutoscaler metadata: - name: {{ include "substrate-telemetry.fullname" . }} + name: telemetry-shard labels: {{- include "substrate-telemetry.labels" . | nindent 4 }} + telemetry-component: shard spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: {{ include "substrate-telemetry.fullname" . }} + name: telemetry-shard minReplicas: {{ .Values.autoscaling.minReplicas }} maxReplicas: {{ .Values.autoscaling.maxReplicas }} metrics: diff --git a/helm/templates/tests/test-connection.yaml b/helm/templates/tests/test-connection.yaml deleted file mode 100644 index a09cc32..0000000 --- a/helm/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "substrate-telemetry.fullname" . }}-test-connection" - labels: - {{- include "substrate-telemetry.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "substrate-telemetry.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/helm/values.yaml b/helm/values.yaml index 3689ca7..1b38cef 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -7,10 +7,10 @@ replicaCount: core: 1 image: - repository: parity/substrate-telemetry-backend + repository: docker.io/parity/substrate-telemetry-backend pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: latest + tag: master-b4117d3a imagePullSecrets: [] nameOverride: "" @@ -48,10 +48,13 @@ service: networking.gke.io/internal-load-balancer-allow-global-access: "true" external-dns.alpha.kubernetes.io/hostname: substrate-telemetry.parity-stg.parity.io. core: - type: ClusterIP + type: LoadBalancer port: 80 targetPort: 8000 - annotations: {} + annotations: + cloud.google.com/load-balancer-type: Internal + networking.gke.io/internal-load-balancer-allow-global-access: "true" + external-dns.alpha.kubernetes.io/hostname: substrate-telemetry-core.parity-stg.parity.io. ingress: @@ -83,11 +86,19 @@ resources: {} # memory: 128Mi autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 + shard: + enabled: true + minReplicas: 3 + maxReplicas: 6 + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 + # telemetry-core is not scalable atm. + core: + enabled: false + minReplicas: 3 + maxReplicas: 6 + targetCPUUtilizationPercentage: 80 + targetMemoryUtilizationPercentage: 80 nodeSelector: {} From 4b00ac79bb8d7acc82f6d5dd6fb9f73be6bd502e Mon Sep 17 00:00:00 2001 From: James Wilson Date: Mon, 2 Aug 2021 14:16:20 +0100 Subject: [PATCH 11/11] Point sahrd to correct port for core --- helm/templates/shard-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/templates/shard-deployment.yaml b/helm/templates/shard-deployment.yaml index 0b73dba..4ed4333 100644 --- a/helm/templates/shard-deployment.yaml +++ b/helm/templates/shard-deployment.yaml @@ -41,7 +41,7 @@ spec: - "--listen" - "0.0.0.0:{{ .Values.service.shard.targetPort }}" - "--core" - - "http://telemetry-core:{{ .Values.service.core.targetPort }}/shard_submit" + - "http://telemetry-core:{{ .Values.service.core.port }}/shard_submit" ports: - name: http containerPort: {{ .Values.service.shard.targetPort }}