Skip to content

Commit

Permalink
feat(contentserver): update chart and bump contentserver
Browse files Browse the repository at this point in the history
  • Loading branch information
franklinkim committed Nov 28, 2024
1 parent 5e69f29 commit 933d83f
Show file tree
Hide file tree
Showing 25 changed files with 2,157 additions and 1,252 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ schema:
helm-schema -n -c charts/beam
helm-schema -n -c charts/namespace
helm-schema -n -c charts/sesamy-gtm
helm-schema -n -c charts/contentserver
helm-schema -n -c charts/squadron-keel-server
helm-schema -n -c charts/squadron-keel-cronjob
helm-schema -n -c charts/squadron-nextjs-server
helm schema-gen charts/contentserver/values.yaml > charts/contentserver/values.schema.json
helm schema-gen charts/csp-reporter/values.yaml > charts/csp-reporter/values.schema.json
helm schema-gen charts/gateway-crds/values.yaml > charts/gateway-crds/values.schema.json
helm schema-gen charts/sesamy-umami/values.yaml > charts/sesamy-umami/values.schema.json
Expand Down
6 changes: 3 additions & 3 deletions charts/contentserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ sources:
annotations:
"artifacthub.io/links": |
- name: Chart Source
url: https://github.com/foomo/helm-charts
url: https://github.com/foomo/helm-charts/tree/main/charts/contentserver
- name: Image Source
url: https://github.com/foomo/contentserver
version: 0.0.3-rc.3
appVersion: 1.11.0-rc.11
version: 0.1.0
appVersion: 1.11.2
227 changes: 150 additions & 77 deletions charts/contentserver/README.md

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions charts/contentserver/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,37 @@ Create the name of the namespace
{{- define "contentserver.namespace" -}}
{{- default .Release.Namespace .Values.namespaceOverride }}
{{- end }}

{{/*
Keel standard envs
{{- include "contentserver.env.log" . | nindent 12 }}
*/}}
{{- define "contentserver.env.log" -}}
- name: LOG_MODE
value: "{{ .Values.log.mode }}"
- name: LOG_LEVEL
value: "{{ .Values.log.level }}"
{{- if eq .Values.log.mode "dev" }}
- name: LOG_DISABLE_CALLER
value: "false"
- name: LOG_DISABLE_STACKTRACE
value: "true"
{{- end }}
{{- end -}}

{{/*
OpenTelemetry standard envs
{{- include "contentserver.env.opentelemetry" . | nindent 12 }}
*/}}
{{- define "contentserver.env.opentelemetry" -}}
- name: OTEL_ENABLED
value: "{{ .Values.otel.enabled }}"
- name: OTEL_SERVICE_NAME
value: {{ include "contentserver.fullname" . | quote }}
- name: OTEL_TRACE_RATIO
value: "{{ .Values.otel.ratio }}"
- name: OTEL_EXPORTER_OTLP_INSECURE
value: "{{ .Values.otel.otlp.insecure }}"
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: "{{ .Values.otel.otlp.endpoint }}"
{{- end -}}
20 changes: 0 additions & 20 deletions charts/contentserver/templates/contentserver/_helpers.tpl

This file was deleted.

148 changes: 0 additions & 148 deletions charts/contentserver/templates/contentserver/deployment.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions charts/contentserver/templates/contentserver/hpa.yaml

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions charts/contentserver/templates/contentserver/service.yaml

This file was deleted.

61 changes: 0 additions & 61 deletions charts/contentserver/templates/contentserver/servicemonitor.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions charts/contentserver/templates/contentserver/validate.yaml

This file was deleted.

Loading

0 comments on commit 933d83f

Please sign in to comment.