Fix merge conflict

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>

charts/spire/README.md

@@ -118,17 +118,14 @@ Kubernetes: `>=1.21.0-0`
 | spire-server.controllerManager.enabled | bool | `true` |  |
 | spire-server.enabled | bool | `true` |  |
 | spire-server.nameOverride | string | `"server"` |  |
-| spire-server.trustDomain | string | `"example.org"` |  |
 | upstream-spiffe-csi-driver.agentSocketPath | string | `"/run/spire/agent-sockets-upstream/spire-agent.sock"` |  |
 | upstream-spiffe-csi-driver.healthChecks.port | int | `9810` |  |
 | upstream-spiffe-csi-driver.pluginName | string | `"upstream.csi.spiffe.io"` |  |
 | upstream-spire-agent.bundleConfigMap | string | `"spire-bundle-upstream"` |  |
-| upstream-spire-agent.clusterName | string | `"example-cluster"` |  |
 | upstream-spire-agent.healthChecks.port | int | `9981` |  |
 | upstream-spire-agent.nameOverride | string | `"agent-upstream"` |  |
 | upstream-spire-agent.serviceAccount.name | string | `"spire-agent-upstream"` |  |
 | upstream-spire-agent.socketPath | string | `"/run/spire/agent-sockets-upstream/spire-agent.sock"` |  |
-| upstream-spire-agent.trustDomain | string | `"example.org"` |  |
 | upstream.enabled | bool | `false` | enable upstream csi driver and agent for use with nested spire. |
 
 ----------------------------------------------

charts/spire/values.yaml

@@ -35,9 +35,6 @@ upstream-spire-agent:
   nameOverride: agent-upstream
   bundleConfigMap: spire-bundle-upstream
 
-  clusterName: *clusterName
-  trustDomain: *trustDomain
-
   socketPath: /run/spire/agent-sockets-upstream/spire-agent.sock
   serviceAccount:
     name: spire-agent-upstream