Merge pull request #75 from philips-labs/oidc-nginx-resources

Author: marcofranssen

charts/spire/Chart.yaml

@@ -27,7 +27,7 @@ description: |
           - --service-account-signing-key-file=/run/config/pki/sa.key
   ```
 type: application
-version: 0.7.0
+version: 0.7.1
 appVersion: "1.5.1"
 keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc"]
 home: https://github.com/philips-labs/helm-charts/charts/spire

charts/spire/README.md

@@ -2,7 +2,7 @@
 
 <!-- This README.md is generated. -->
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
+![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
 
 A Helm chart for deploying spire-server and spire-agent.
 
@@ -89,6 +89,7 @@ Kubernetes: `>=1.21.0-0`
 | oidc.insecureScheme.nginx.image.registry | string | `"docker.io"` |  |
 | oidc.insecureScheme.nginx.image.repository | string | `"nginx"` |  |
 | oidc.insecureScheme.nginx.image.version | string | `"1.23.2-alpine"` |  |
+| oidc.insecureScheme.nginx.resources | object | `{}` |  |
 | oidc.nodeSelector."kubernetes.io/arch" | string | `"amd64"` |  |
 | oidc.podAnnotations | object | `{}` |  |
 | oidc.podSecurityContext | object | `{}` |  |

charts/spire/templates/oidc-deployment.yaml

@@ -87,6 +87,8 @@ spec:
               mountPath: /etc/nginx/templates/default.conf.template
               subPath: default.conf.template
               readOnly: true
+          resources:
+            {{- toYaml .Values.oidc.insecureScheme.nginx.resources | nindent 12 }}
         {{- end }}
       volumes:
         - name: spiffe-workload-api

charts/spire/values.yaml

@@ -214,6 +214,17 @@ oidc:
         # repository: chainguard/nginx
         # pullPolicy: IfNotPresent
         # version: "1.23.2"
+      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:'.
+        # requests:
+        #   cpu: 50m
+        #   memory: 32Mi
+        # limits:
+        #   cpu: 100m
+        #   memory: 64Mi
 
   config:
     logLevel: info