Merge pull request #4521 from bill-mahoney/spire-update

build: update spire
edgexfoundry · Apr 24, 2023 · 50d4b10 · 50d4b10
2 parents 0e40ac5 + adae084
commit 50d4b10
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cmd/security-spire-agent/Dockerfile b/cmd/security-spire-agent/Dockerfile
@@ -28,7 +28,7 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
 
 COPY . .
 
-ARG SPIRE_RELEASE=1.2.1
+ARG SPIRE_RELEASE=1.6.3
 
 # build spire from the source in order to be compatible with arch arm64 as well
 # in CI the BUILDER_BASE will already contain a compiled spire-server/agent

diff --git a/cmd/security-spire-config/Dockerfile b/cmd/security-spire-config/Dockerfile
@@ -28,7 +28,7 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
 
 COPY . .
 
-ARG SPIRE_RELEASE=1.2.1
+ARG SPIRE_RELEASE=1.6.3
 
 # build spire from the source in order to be compatible with arch arm64 as well
 # in CI the BUILDER_BASE will already contain a compiled spire-server/agent

diff --git a/cmd/security-spire-server/Dockerfile b/cmd/security-spire-server/Dockerfile
@@ -28,7 +28,7 @@ RUN [ ! -d "vendor" ] && go mod download all || echo "skipping..."
 
 COPY . .
 
-ARG SPIRE_RELEASE=1.2.1
+ARG SPIRE_RELEASE=1.6.3
 
 # build spire from the source in order to be compatible with arch arm64 as well
 # in CI the BUILDER_BASE will already contain a compiled spire-server/agent

diff --git a/cmd/security-spire-server/server.conf b/cmd/security-spire-server/server.conf
@@ -4,7 +4,8 @@ server {
     log_file = "/dev/stdout"
     log_level = "DEBUG"
     data_dir = "/srv/spiffe/server/data"
-    default_svid_ttl = "1h"
+    default_x509_svid_ttl = "1h"
+    default_jwt_svid_ttl = "5m"
     ca_key_type = "ec-p384"
     ca_subject {
         country = ["US"]