diff --git a/imghost/Chart.yaml b/imghost/Chart.yaml index f574c8e3f8a8d1330c7152f6c81e6e3a55575b58..cc19bda0395e45b638504e2923e98a30720346fe 100644 --- a/imghost/Chart.yaml +++ b/imghost/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: imghost description: Helm Chart for imghost type: application -version: 1.0.2 -appVersion: "d7c3db94" +version: 1.0.3 +appVersion: "04828ff3" diff --git a/imghost/templates/deployment-backend.yaml b/imghost/templates/deployment-backend.yaml index c44132a935ee64251f8506ed1666991ab283631e..045227dead52f55643c5d78876e8f9cbfc9cacac 100644 --- a/imghost/templates/deployment-backend.yaml +++ b/imghost/templates/deployment-backend.yaml @@ -59,7 +59,7 @@ spec: path: /healthz port: metrics resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.backend | nindent 12 }} volumeMounts: - mountPath: "/config.yaml" name: config diff --git a/imghost/templates/deployment-frontend.yaml b/imghost/templates/deployment-frontend.yaml index 93f2b4d7504e986fa03d6f41cd2da63022d2183e..2feb7aa4b9a7f98d77a9229c30dcf7656ff99423 100644 --- a/imghost/templates/deployment-frontend.yaml +++ b/imghost/templates/deployment-frontend.yaml @@ -59,7 +59,7 @@ spec: path: /healthz port: http resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.frontend | nindent 12 }} volumeMounts: - mountPath: "/config.yaml" name: config diff --git a/imghost/templates/deployment-oauth.yaml b/imghost/templates/deployment-oauth.yaml index 5e86e0f0782471548b0473aa04e6c8a0f69cd528..c8d20de1954164112201effb501f496d91ab288c 100644 --- a/imghost/templates/deployment-oauth.yaml +++ b/imghost/templates/deployment-oauth.yaml @@ -90,7 +90,7 @@ spec: volumeMounts: - mountPath: "/proxy_config.yaml" name: config - subPath: "proxy-config" + subPath: config {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/imghost/values.yaml b/imghost/values.yaml index cd7bb757e4134d5eaff9b04a4e07cb7c0d1c018e..c7be62b515973978b3e18774e9bd23cb7b806035 100644 --- a/imghost/values.yaml +++ b/imghost/values.yaml @@ -8,11 +8,23 @@ frontend: repository: k8r.eu/justjanne/imghost pullPolicy: IfNotPresent tag: "" + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi backend: repository: k8r.eu/justjanne/imghost pullPolicy: IfNotPresent tag: "" + limits: + cpu: 4 + memory: 4Gi + requests: + cpu: 10m + memory: 64Mi oauth2: repository: k8r.eu/justjanne/keycloak-proxy @@ -80,14 +92,6 @@ securityContext: runAsNonRoot: true runAsUser: 1000 -resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 10m - memory: 64Mi - nodeSelector: { } tolerations: [ ]