Merge branch 'master' into error-spans

OneUptime · Apr 11, 2024 · 5b0f450 · 5b0f450
2 parents 14d049b + be2b328
commit 5b0f450
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 0 deletions.
diff --git a/HelmChart/Public/oneuptime/README.md b/HelmChart/Public/oneuptime/README.md
@@ -89,6 +89,10 @@ The following table lists the configurable parameters of the OneUptime chart and
 | `incidents.disableAutomaticCreation` | Disable incident creation (use this when your team is overloaded with incidents or in emergencies) | `false` |  |
 | `podSecurityContext` | Pod Security Context. Please refer to Kubernetes docuemntation to set these. This chart depends on other bitnami charts. You will have to set security context for those as well | `{}` |  |
 | `conatinerSecurityContext` | Container Security Context. Please refer to kubernetes documentation to set these. This chart depends on other bitnami charts. You will have to set security context for those as well | `{}` |  |
+| `nodeSelector` | Node Selector. Please refer to Kubernetes documentation on how to use them. | `{}` |  |
+| `tolerations` | Tolerations. Please refer to Kubernetes documentation on how to use them. | `[]` |  |
+| `affinity` | Affinity. Please refer to Kubernetes documentation on how to use them. | `{}` |  |
+
 
 ## Adding a Custom Domain to your Status Page
 

diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -246,6 +246,15 @@ spec:
       {{- if $.Values.podSecurityContext }}
       securityContext: {{- $.Values.podSecurityContext | toYaml | nindent 8 }}
       {{- end }}
+      {{- if $.Values.affinity }}
+      affinity: {{- $.Values.affinity | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.tolerations }}
+      tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.nodeSelector }}
+      nodeSelector: {{- $.Values.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
       {{- if $.Volumes }}
       volumes:
       {{- range $key, $val := $.Volumes }}

diff --git a/HelmChart/Public/oneuptime/templates/app.yaml b/HelmChart/Public/oneuptime/templates/app.yaml
@@ -25,6 +25,15 @@ spec:
       {{- if $.Values.podSecurityContext }}
       securityContext: {{- $.Values.podSecurityContext | toYaml | nindent 8 }}
       {{- end }}
+      {{- if $.Values.affinity }}
+      affinity: {{- $.Values.affinity | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.tolerations }}
+      tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.nodeSelector }}
+      nodeSelector: {{- $.Values.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
       containers:
         - image: {{ printf "%s/%s/%s:%s" $.Values.image.registry $.Values.image.repository "app" $.Values.image.tag }}
           name: {{ printf "%s-%s" $.Release.Name "app"  }}

diff --git a/HelmChart/Public/oneuptime/templates/isolated-vm.yaml b/HelmChart/Public/oneuptime/templates/isolated-vm.yaml
@@ -26,6 +26,15 @@ spec:
       {{- if $.Values.podSecurityContext }}
       securityContext: {{- $.Values.podSecurityContext | toYaml | nindent 8 }}
       {{- end }}
+      {{- if $.Values.affinity }}
+      affinity: {{- $.Values.affinity | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.tolerations }}
+      tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.nodeSelector }}
+      nodeSelector: {{- $.Values.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
       containers:
         - image: {{ printf "%s/%s/%s:%s" $.Values.image.registry $.Values.image.repository "isolated-vm" $.Values.image.tag }}
           name: {{ printf "%s-%s" $.Release.Name "isolated-vm"  }}

diff --git a/HelmChart/Public/oneuptime/templates/probe.yaml b/HelmChart/Public/oneuptime/templates/probe.yaml
@@ -21,7 +21,18 @@ spec:
         app: {{ printf "%s-%s" $.Release.Name (printf "probe-%s" $key)  }}
         date: "{{ now | unixEpoch }}"
     spec:
+      {{- if $.Values.podSecurityContext }}
       securityContext: {{- $.Values.podSecurityContext | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.affinity }}
+      affinity: {{- $.Values.affinity | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.tolerations }}
+      tolerations: {{- $.Values.tolerations | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if $.Values.nodeSelector }}
+      nodeSelector: {{- $.Values.nodeSelector | toYaml | nindent 8 }}
+      {{- end }}
       containers:
         - image: {{ printf "%s/%s/%s:%s" $.Values.image.registry $.Values.image.repository "probe" $.Values.image.tag }}
           name: {{ printf "%s-%s" $.Release.Name (printf "probe-%s" $key)  }}

diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
@@ -179,6 +179,9 @@ openTelemetryExporter:
 
 containerSecurityContext:
 podSecurityContext:
+affinity:
+tolerations:
+nodeSelector:
 
 
 # This can be one of the following: DEBUG, INFO, WARN, ERROR