From fe4e78f6b04b3dcfb54b9cd0d86581727c2b65ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Schmitz=20von=20H=C3=BClst?=
 <moritz.schmitz@oviva.com>
Date: Wed, 14 Feb 2024 11:48:10 +0100
Subject: [PATCH] Wrong key location?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Moritz Schmitz von Hülst <moritz.schmitz@oviva.com>
---
 .github/tests/spire-values.yaml.tpl | 7 +++----
 .github/workflows/test.yaml         | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/tests/spire-values.yaml.tpl b/.github/tests/spire-values.yaml.tpl
index 23d91c19..368e92be 100644
--- 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
index 8b8f4379..01a498d5 100644
--- 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