Wrong key location?

Signed-off-by: Moritz Schmitz von Hülst <[email protected]>
spiffe · Feb 14, 2024 · fe4e78f · fe4e78f
1 parent 04e3952
commit fe4e78f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/tests/spire-values.yaml.tpl b/.github/tests/spire-values.yaml.tpl
@@ -1,7 +1,6 @@
-global:
-  spire:
-    trustDomain: $TRUST_DOMAIN
 spire-server:
+  ca_subject:
+    common_name: $TRUSTSTORE_COMMON_NAME
   controllerManager:
     identities:
       clusterSPIFFEIDs:
@@ -16,4 +15,4 @@ spire-server:
             matchLabels:
               app: java-spiffe-helper
           dnsNameTemplates:
-            - $DNS_NAME_TEMPLATE
+            - $KEYSTORE_COMMON_NAME
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      DNS_NAME_TEMPLATE: dns-${{ github.sha }}
-      TRUST_DOMAIN: domain-${{ github.sha }}
+      KEYSTORE_COMMON_NAME: keystore-${{ github.sha }}
+      TRUSTSTORE_COMMON_NAME: truststore-${{ github.sha }}
 
     steps:
       - uses: actions/checkout@v4
@@ -48,9 +48,9 @@ jobs:
           java-version: '17'
       - run: kubectl cp java-spiffe-helper:/tmp/keystore.p12 keystore.p12
       - run: kubectl cp java-spiffe-helper:/tmp/truststore.p12 truststore.p12
-      - run: keytool -v -list -keystore keystore.p12 -storepass password | grep "CN=${{ env.DNS_NAME_TEMPLATE }}"
+      - run: keytool -v -list -keystore keystore.p12 -storepass password | grep "CN=${{ env.KEYSTORE_COMMON_NAME }}"
       - if: ${{ failure() }}
         run: keytool -v -list -keystore keystore.p12 -storepass password
-      - run: keytool -v -list -keystore truststore.p12 -storepass password | grep "CN=${{ env.TRUST_DOMAIN }}"
+      - run: keytool -v -list -keystore truststore.p12 -storepass password | grep "CN=${{ env.TRUSTSTORE_COMMON_NAME }}"
       - if: ${{ failure() }}
         run: keytool -v -list -keystore truststore.p12 -storepass password