From a878eb2ed89c22ab97260f44bab83d59ef771b8b Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 27 Oct 2024 20:06:18 +0100 Subject: [PATCH 1/3] add fix helm chart for argo compliance --- charts/openlit/templates/client.yaml | 12 ++++++++++-- charts/openlit/values.yaml | 16 ++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/charts/openlit/templates/client.yaml b/charts/openlit/templates/client.yaml index 343b8e0..644ac6c 100644 --- a/charts/openlit/templates/client.yaml +++ b/charts/openlit/templates/client.yaml @@ -62,7 +62,7 @@ metadata: labels: app: {{ include "openlit.fullname" . }} {{- include "openlit.labels" . | nindent 4 }} - app.kubernetes.io/component: openlit + # app.kubernetes.io/component: openlit name: {{ include "openlit.fullname" . }} namespace: {{ .Release.Namespace }} spec: @@ -166,14 +166,22 @@ spec: items: - key: opentelemetry-collector-config path: opentelemetry-collector-config.yaml + {{- if .Values.imagePullSecrets }} imagePullSecrets: {{- range .Values.imagePullSecrets }} - name: {{ . }} {{- end }} + {{- end }} nodeSelector: + {{- if .Values.nodeSelector }} {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- else }} + kubernetes.io/os: linux + {{- end }} + {{- if .Values.tolerations }} tolerations: - {{ toYaml .Values.tolerations | nindent 8 }} + {{- toYaml .Values.tolerations | nindent 8 }} + {{- end }} affinity: {{ toYaml .Values.affinity | nindent 8 }} --- diff --git a/charts/openlit/values.yaml b/charts/openlit/values.yaml index 4d7be51..d950a07 100644 --- a/charts/openlit/values.yaml +++ b/charts/openlit/values.yaml @@ -5,7 +5,7 @@ fullnameOverride: "" # Additional labels to add to all resources. additionalLabels: {} - # my-label: my-value +# my-label: my-value # Number of replicas replicaCount: 1 @@ -31,7 +31,7 @@ service: # Resource limit and request configuration for the OpenLIT pod resources: limits: - cpu: 1000m + cpu: 1 memory: 1280Mi requests: cpu: 100m @@ -123,13 +123,13 @@ ingress: enabled: false className: "" annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: From 72707a73ddbafbea440f0e1d9c3a2c7505468b84 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 27 Oct 2024 20:25:05 +0100 Subject: [PATCH 2/3] fix: chart openlit --- charts/openlit/templates/client.yaml | 6 +++--- charts/openlit/values.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/openlit/templates/client.yaml b/charts/openlit/templates/client.yaml index 644ac6c..18cbd55 100644 --- a/charts/openlit/templates/client.yaml +++ b/charts/openlit/templates/client.yaml @@ -5,7 +5,7 @@ metadata: name: openlit-collector-config labels: app: {{ include "openlit.fullname" . }} - {{- include "openlit.labels" . | nindent 4 }} + # {{- include "openlit.labels" . | nindent 4 }} app.kubernetes.io/component: opentelemetry-collector data: opentelemetry-collector-config: | @@ -62,7 +62,7 @@ metadata: labels: app: {{ include "openlit.fullname" . }} {{- include "openlit.labels" . | nindent 4 }} - # app.kubernetes.io/component: openlit + app.kubernetes.io/component: openlit name: {{ include "openlit.fullname" . }} namespace: {{ .Release.Namespace }} spec: @@ -72,7 +72,7 @@ spec: matchLabels: app: {{ include "openlit.fullname" . }} {{- include "openlit.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: openlit + # app.kubernetes.io/component: openlit template: metadata: labels: diff --git a/charts/openlit/values.yaml b/charts/openlit/values.yaml index d950a07..7e4e325 100644 --- a/charts/openlit/values.yaml +++ b/charts/openlit/values.yaml @@ -31,7 +31,7 @@ service: # Resource limit and request configuration for the OpenLIT pod resources: limits: - cpu: 1 + cpu: '1' memory: 1280Mi requests: cpu: 100m From 25ebf479060dbe2d2a5a6c9bf91c86869b75a59e Mon Sep 17 00:00:00 2001 From: Patcher Date: Mon, 28 Oct 2024 09:30:42 -0400 Subject: [PATCH 3/3] Update Chart.yaml --- charts/openlit/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openlit/Chart.yaml b/charts/openlit/Chart.yaml index 93a49cd..fcbcddc 100644 --- a/charts/openlit/Chart.yaml +++ b/charts/openlit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: openlit description: A Helm chart for OpenLIT type: application -version: 1.11.0 +version: 1.11.1 appVersion: 1.11.0 icon: https://avatars.githubusercontent.com/u/149867240?s=200&v=4