From d1ed9564c292b03f12406f80a8954036a4dbbdc1 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 18 Apr 2025 16:35:46 +0200 Subject: [PATCH] feat(assist-server): removed helm chart for assist-server --- .../charts/assist-server/.helmignore | 23 --- .../charts/assist-server/Chart.yaml | 24 ---- .../charts/assist-server/templates/NOTES.txt | 22 --- .../assist-server/templates/_helpers.tpl | 65 --------- .../assist-server/templates/deployment.yaml | 113 --------------- .../charts/assist-server/templates/hpa.yaml | 33 ----- .../assist-server/templates/ingress.yaml | 56 -------- .../assist-server/templates/service.yaml | 18 --- .../templates/serviceMonitor.yaml | 18 --- .../templates/serviceaccount.yaml | 13 -- .../charts/assist-server/values.yaml | 134 ------------------ .../openreplay/charts/assist/values.yaml | 1 - 12 files changed, 520 deletions(-) delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/.helmignore delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/Chart.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/NOTES.txt delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/_helpers.tpl delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/deployment.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/hpa.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/ingress.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/service.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/serviceMonitor.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/templates/serviceaccount.yaml delete mode 100644 scripts/helmcharts/openreplay/charts/assist-server/values.yaml diff --git a/scripts/helmcharts/openreplay/charts/assist-server/.helmignore b/scripts/helmcharts/openreplay/charts/assist-server/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/.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/scripts/helmcharts/openreplay/charts/assist-server/Chart.yaml b/scripts/helmcharts/openreplay/charts/assist-server/Chart.yaml deleted file mode 100644 index 57014cf36..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: assist-server -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 assist-server or functions for the chart developer. They're included as -# a dependency of application charts to inject those assist-server 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.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: "v1.22.0" diff --git a/scripts/helmcharts/openreplay/charts/assist-server/templates/NOTES.txt b/scripts/helmcharts/openreplay/charts/assist-server/templates/NOTES.txt deleted file mode 100644 index e23331c6d..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/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.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "assist-server.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 "assist-server.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "assist-server.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 "assist-server.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/scripts/helmcharts/openreplay/charts/assist-server/templates/_helpers.tpl b/scripts/helmcharts/openreplay/charts/assist-server/templates/_helpers.tpl deleted file mode 100644 index 1b621eb3d..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/_helpers.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "assist-server.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 "assist-server.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 "assist-server.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "assist-server.labels" -}} -helm.sh/chart: {{ include "assist-server.chart" . }} -{{ include "assist-server.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- if .Values.global.appLabels }} -{{- .Values.global.appLabels | toYaml | nindent 0}} -{{- end}} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "assist-server.selectorLabels" -}} -app.kubernetes.io/name: {{ include "assist-server.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "assist-server.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "assist-server.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/scripts/helmcharts/openreplay/charts/assist-server/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/deployment.yaml deleted file mode 100644 index 102a6a8d8..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/deployment.yaml +++ /dev/null @@ -1,113 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "assist-server.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "assist-server.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "assist-server.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "assist-server.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - shareProcessNamespace: true - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - {{- if .Values.global.enterpriseEditionLicense }} - image: "{{ tpl .Values.image.repository . }}:{{ .Values.image.tag | default .Chart.AppVersion }}-ee" - {{- else }} - image: "{{ tpl .Values.image.repository . }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - {{- end }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- if .Values.healthCheck}} - {{- .Values.healthCheck | toYaml | nindent 10}} - {{- end}} - env: - - name: ASSIST_JWT_SECRET - value: {{ .Values.global.assistJWTSecret }} - - name: ASSIST_KEY - value: {{ .Values.global.assistKey }} - - name: AWS_DEFAULT_REGION - value: "{{ .Values.global.s3.region }}" - - name: S3_HOST - {{- if contains "minio" .Values.global.s3.endpoint }} - value: '{{ ternary "https" "http" .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}' - {{- else}} - value: '{{ .Values.global.s3.endpoint }}' - {{- end}} - - name: S3_KEY - {{- if .Values.global.s3.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.global.s3.existingSecret }} - key: access-key - {{- else }} - value: {{ .Values.global.s3.accessKey }} - {{- end }} - - name: S3_SECRET - {{- if .Values.global.s3.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.global.s3.existingSecret }} - key: secret-key - {{- else }} - value: {{ .Values.global.s3.secretKey }} - {{- end }} - - name: REDIS_URL - value: {{ .Values.global.redis.redisHost }} - {{- range $key, $val := .Values.global.env }} - - name: {{ $key }} - value: '{{ $val }}' - {{- end }} - {{- range $key, $val := .Values.env }} - - name: {{ $key }} - value: '{{ $val }}' - {{- end}} - ports: - {{- range $key, $val := .Values.service.ports }} - - name: {{ $key }} - containerPort: {{ $val }} - {{- end }} - protocol: TCP - {{- with .Values.persistence.mounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.persistence.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- 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/scripts/helmcharts/openreplay/charts/assist-server/templates/hpa.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/hpa.yaml deleted file mode 100644 index 80f270bc4..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/hpa.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "assist-server.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "assist-server.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/scripts/helmcharts/openreplay/charts/assist-server/templates/ingress.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/ingress.yaml deleted file mode 100644 index 7811676c1..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/ingress.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{{- if .Values.ingress.enabled }} -{{- $fullName := include "assist-server.fullname" . -}} -{{- $socketioSvcPort := .Values.service.ports.socketio -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ $fullName }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} - annotations: - nginx.ingress.kubernetes.io/rewrite-target: /$1 - nginx.ingress.kubernetes.io/configuration-snippet: | - #set $sticky_used "no"; - #if ($sessionid != "") { - # set $sticky_used "yes"; - #} - - #add_header X-Debug-Session-ID $sessionid; - #add_header X-Debug-Session-Type "wss"; - #add_header X-Sticky-Session-Used $sticky_used; - #add_header X-Upstream-Server $upstream_addr; - - proxy_hide_header access-control-allow-headers; - proxy_hide_header Access-Control-Allow-Origin; - add_header 'Access-Control-Allow-Origin' $http_origin always; - add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'sessionid, Content-Type, Authorization' always; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - - nginx.ingress.kubernetes.io/upstream-hash-by: $sessionid - - {{- with .Values.ingress.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - ingressClassName: "{{ tpl .Values.ingress.className . }}" - tls: - - hosts: - - {{ .Values.global.domainName }} - {{- if .Values.ingress.tls.secretName}} - secretName: {{ .Values.ingress.tls.secretName }} - {{- end}} - rules: - - host: {{ .Values.global.domainName }} - http: - paths: - - pathType: Prefix - backend: - service: - name: {{ $fullName }} - port: - number: {{ $socketioSvcPort }} - path: /ws-assist-server/(.*) -{{- end }} diff --git a/scripts/helmcharts/openreplay/charts/assist-server/templates/service.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/service.yaml deleted file mode 100644 index cf23f4676..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "assist-server.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - {{- range $key, $val := .Values.service.ports }} - - port: {{ $val }} - targetPort: {{ $key }} - protocol: TCP - name: {{ $key }} - {{- end}} - selector: - {{- include "assist-server.selectorLabels" . | nindent 4 }} diff --git a/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceMonitor.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceMonitor.yaml deleted file mode 100644 index 6fa157aff..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceMonitor.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "assist-server.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} - {{- if .Values.serviceMonitor.additionalLabels }} - {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }} - {{- end }} -spec: - endpoints: - {{- .Values.serviceMonitor.scrapeConfigs | toYaml | nindent 4 }} - selector: - matchLabels: - {{- include "assist-server.selectorLabels" . | nindent 6 }} -{{- end }} diff --git a/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceaccount.yaml b/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceaccount.yaml deleted file mode 100644 index eb5d75858..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "assist-server.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "assist-server.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/scripts/helmcharts/openreplay/charts/assist-server/values.yaml b/scripts/helmcharts/openreplay/charts/assist-server/values.yaml deleted file mode 100644 index a2db60b69..000000000 --- a/scripts/helmcharts/openreplay/charts/assist-server/values.yaml +++ /dev/null @@ -1,134 +0,0 @@ -# Default values for openreplay. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: "{{ .Values.global.openReplayContainerRegistry }}/assist-server" - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "assist-server" -fullnameOverride: "assist-server-openreplay" - -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: {} - -securityContext: - runAsUser: 1001 - runAsGroup: 1001 -podSecurityContext: - runAsUser: 1001 - runAsGroup: 1001 - fsGroup: 1001 - fsGroupChangePolicy: "OnRootMismatch" -# podSecurityContext: {} - # fsGroup: 2000 - -# securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -#service: -# type: ClusterIP -# port: 9000 - -serviceMonitor: - enabled: false - additionalLabels: - release: observability - scrapeConfigs: - - port: metrics - honorLabels: true - interval: 15s - path: /metrics - scheme: http - scrapeTimeout: 10s - -service: - type: ClusterIP - ports: - socketio: 9001 - metrics: 8888 - -ingress: - enabled: true - className: "{{ .Values.global.ingress.controller.ingressClassResource.name }}" - annotations: - nginx.ingress.kubernetes.io/configuration-snippet: | - add_header X-Debug-Session-ID $http_sessionid; - add_header X-Debug-Session-Type "wss"; - - # CORS configuration - # We don't need the upstream header - proxy_hide_header Access-Control-Allow-Origin; - add_header 'Access-Control-Allow-Origin' $http_origin always; - add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'sessionid, Content-Type, Authorization' always; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" - nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - tls: - secretName: openreplay-ssl - -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: 5 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -env: - debug: 0 - uws: false - redis: false - CLEAR_SOCKET_TIME: 720 - - -nodeSelector: {} - -tolerations: [] - -affinity: {} - - -persistence: {} - # # Spec of spec.template.spec.containers[*].volumeMounts - # mounts: - # - name: kafka-ssl - # mountPath: /opt/kafka/ssl - # # Spec of spec.template.spec.volumes - # volumes: - # - name: kafka-ssl - # secret: - # secretName: kafka-ssl diff --git a/scripts/helmcharts/openreplay/charts/assist/values.yaml b/scripts/helmcharts/openreplay/charts/assist/values.yaml index a3a14eff5..426b1bb72 100644 --- a/scripts/helmcharts/openreplay/charts/assist/values.yaml +++ b/scripts/helmcharts/openreplay/charts/assist/values.yaml @@ -110,7 +110,6 @@ autoscaling: env: debug: 0 - uws: false redis: false CLEAR_SOCKET_TIME: 720