Skip to content

Commit 1744e87

Browse files
authored
Update SPIRE version in CI (#183)
Signed-off-by: Max Lambrecht <[email protected]>
1 parent c087c44 commit 1744e87

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

.github/workflows/scripts/agent.conf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
agent {
2-
data_dir = "./data/agent"
3-
log_level = "DEBUG"
42
trust_domain = "example.org"
3+
log_level = "DEBUG"
4+
55
server_address = "localhost"
66
server_port = 8081
77

8-
# Insecure bootstrap is NOT appropriate for production use but is ok for
9-
# simple testing/evaluation purposes.
8+
socket_path = "/tmp/spire-agent/public/api.sock"
9+
10+
data_dir = "/tmp/spire-agent/data"
11+
1012
insecure_bootstrap = true
1113

1214
admin_socket_path = "$STRIPPED_SPIRE_ADMIN_ENDPOINT_SOCKET"
@@ -18,7 +20,7 @@ agent {
1820
plugins {
1921
KeyManager "disk" {
2022
plugin_data {
21-
directory = "./data/agent"
23+
directory = "/tmp/spire-agent/keys"
2224
}
2325
}
2426

.github/workflows/scripts/run-spire.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
44

55
# Constants
6-
spire_version="1.11.0"
6+
spire_version="1.14.0"
77
spire_folder="spire-${spire_version}"
88
spire_server_log_file="/tmp/spire-server/server.log"
99
spire_server_socket_path="/tmp/spire-server/private/api.sock"
@@ -65,7 +65,7 @@ wait_for_service "bin/spire-agent healthcheck" "SPIRE Agent" "${spire_agent_log_
6565
# Register workloads
6666
for service in "myservice" "myservice2"; do
6767
echo "Creating entry for '${service}'"
68-
bin/spire-server entry create -parentID ${agent_id} -spiffeID spiffe://example.org/${service} -selector unix:uid:$(id -u) -x509SVIDTTL 5 -jwtSVIDTTL 5 -federatesWith spiffe://example-federated.org
68+
bin/spire-server entry create -parentID ${agent_id} -spiffeID spiffe://example.org/${service} -dns example.org -selector unix:uid:$(id -u) -x509SVIDTTL 5 -jwtSVIDTTL 5 -federatesWith spiffe://example-federated.org
6969
done
7070

7171
uid=$(id -u)

.github/workflows/scripts/server.conf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ server {
22
bind_address = "127.0.0.1"
33
bind_port = "8081"
44
trust_domain = "example.org"
5-
data_dir = "./data/server"
5+
6+
data_dir = "/tmp/spire-server"
7+
68
socket_path = "$SPIRE_SOCKET_PATH"
9+
710
log_level = "DEBUG"
811
ca_ttl = "168h"
912
default_x509_svid_ttl = "48h"
@@ -22,13 +25,13 @@ plugins {
2225
DataStore "sql" {
2326
plugin_data {
2427
database_type = "sqlite3"
25-
connection_string = "./data/server/datastore.sqlite3"
28+
connection_string = "/tmp/spire-server/datastore.sqlite3"
2629
}
2730
}
2831

2932
KeyManager "disk" {
3033
plugin_data {
31-
keys_path = "./data/server/keys.json"
34+
keys_path = "/tmp/spire-server/keys.json"
3235
}
3336
}
3437

0 commit comments

Comments
 (0)