Merge pull request #5 from elinesterov/update-chart-docs

Update chart to support customization of the SPIFFE socket name.

charts/spiffe-demo-app/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: spiffe-demo-app
 description: A Helm chart to install spiffe-demo-app
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: 0.1.1

charts/spiffe-demo-app/README.md

@@ -1,18 +1,25 @@
 # spiffe-demo-app
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square)
 
 A Helm chart to install spiffe-demo-app
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| app | object | `{"enableBusybox":false,"spiffeCSIDriverVolume":true,"spiffeSocketMountPathDir":"/spiffe-workload-api","spiffeSocketName":"agent.sock"}` | The App configuration |
+| app.enableBusybox | bool | `false` | Enable busybox container |
+| app.spiffeCSIDriverVolume | bool | `true` | Add SPIFFE CSIdirver volume |
+| app.spiffeSocketMountPathDir | string | `"/spiffe-workload-api"` | SPIFFE Workload API socket mount path |
+| app.spiffeSocketName | string | `"agent.sock"` | SPIFFE Workload API socket name exposed by the agent the resulting default socket path will be /spiffe-workload-api/agent.sock spiffeSocketName is a filename from the socket path for the agent |
 | image.pullPolicy | string | `"IfNotPresent"` | The image pull policy |
 | image.registry | string | `"ghcr.io"` | The OCI registry to pull the image from |
 | image.repository | string | `"elinesterov/spiffe-demo-app"` | The repository within the registry |
 | image.tag | string | `"v0.1.1"` | The image tag to pull |
 | service | object | `{"port":80,"type":"LoadBalancer"}` | The service type to use |
+| spiffeCSIDriver | object | `{"enabled":true}` | SPIFFE CSI driver support |
+| spiffeCSIDriver.enabled | bool | `true` | Enable/disable SPIFFE CSI driver support |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/spiffe-demo-app/templates/deployment.yaml

@@ -19,7 +19,7 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
           - name: SPIFFE_ENDPOINT_SOCKET
-            value: "unix://{{ .Values.app.spiffeSocketMountPathDir }}/agent.sock"
+            value: "unix://{{ .Values.app.spiffeSocketMountPathDir }}/{{ .Values.app.spiffeSocketName }}"
         ports:
         - containerPort: 8080
       {{- if .Values.app.spiffeCSIDriverVolume }}
@@ -33,7 +33,7 @@ spec:
         command: ['sleep', '3600']
         env:
           - name: SPIFFE_ENDPOINT_SOCKET
-            value: "unix://{{ .Values.app.spiffeSocketMountPathDir }}/agent.sock"
+            value: "unix://{{ .Values.app.spiffeSocketMountPathDir }}/{{ .Values.app.spiffeSocketName }}"
         imagePullPolicy: IfNotPresent
         {{- if .Values.app.spiffeCSIDriverVolume }}
         volumeMounts:

charts/spiffe-demo-app/values.yaml

@@ -17,8 +17,12 @@ service:
 
 # -- The App configuration
 app:
-  # -- SPIFFE agent socket mount path
+  # -- SPIFFE Workload API socket mount path
   spiffeSocketMountPathDir: /spiffe-workload-api
+  # -- SPIFFE Workload API socket name exposed by the agent
+  # the resulting default socket path will be /spiffe-workload-api/agent.sock
+  # spiffeSocketName is a filename from the socket path for the agent
+  spiffeSocketName: agent.sock
   # -- Add SPIFFE CSIdirver volume
   spiffeCSIDriverVolume: true
   # -- Enable busybox container