Skip to content

Update SPIRE tutorial images and Go security patches #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keeganwitt wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −27
Open

Update SPIRE tutorial images and Go security patches #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request: {}
workflow_dispatch: {}
env:
GO_VERSION: 1.24.0
GO_VERSION: 1.26.10
CHANGE_MINIKUBE_NONE_USER: true
TERM: xterm
jobs:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/federation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ In this tutorial you will learn how to:

The baseline components for SPIFFE federation are:

* Two SPIRE Server instances running version 1.11.2.
* Two SPIRE Agents running version 1.11.2. One connected to one SPIRE Server, and the second connected to the other SPIRE Server.
* Two SPIRE Server instances running version 1.15.5.
* Two SPIRE Agents running version 1.15.5. One connected to one SPIRE Server, and the second connected to the other SPIRE Server.
* Two workloads that need to communicate each other via mTLS, and use the Workload API to get SVIDs and trust bundles.

# Scenario
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/federation/docker/broker-webapp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/spiffe/spire-agent:1.5.1
FROM ghcr.io/spiffe/spire-agent:1.15.5

COPY conf/agent.conf /opt/spire/conf/agent/agent.conf
COPY conf/agent.key.pem /opt/spire/conf/agent/agent.key.pem
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/federation/docker/spire-server-broker.example/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/spiffe/spire-server:1.11.2
FROM ghcr.io/spiffe/spire-server:1.15.5

# Override spire configurations
COPY conf/server.conf /opt/spire/conf/server/server.conf
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/federation/docker/spire-server-stockmarket.example/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/spiffe/spire-server:1.11.2
FROM ghcr.io/spiffe/spire-server:1.15.5

# Override spire configurations
COPY conf/server.conf /opt/spire/conf/server/server.conf
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/federation/docker/stock-quotes-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/spiffe/spire-agent:1.5.1 as spire
FROM ghcr.io/spiffe/spire-agent:1.15.5 as spire

COPY conf/agent.conf /opt/spire/conf/agent/agent.conf
COPY conf/agent.key.pem /opt/spire/conf/agent/agent.key.pem
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/metrics/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ services:
ports:
- "9090:9090"
spire-server:
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: spire-server
volumes:
- ./spire/server:/opt/spire/conf/server
command: ["-config", "/opt/spire/conf/server/server.conf"]
spire-agent:
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
depends_on: ["spire-server"]
hostname: spire-agent
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/nested-spire/.go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.4
1.26.10
6 changes: 3 additions & 3 deletions docker-compose/nested-spire/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ We define all the services for the tutorial in the [docker-compose.yaml](docker-
services:
# Root
root-server:
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: root-server
volumes:
- ./root/server:/opt/spire/conf/server
command: ["-config", "/opt/spire/conf/server/server.conf"]
root-agent:
# Share the host pid namespace so this agent can attest the nested servers
pid: "host"
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
depends_on: ["root-server"]
hostname: root-agent
volumes:
Expand Down Expand Up @@ -91,7 +91,7 @@ The Docker Compose definition for the `nestedA-server` service in the [docker-co
nestedA-server:
# Share the host pid namespace so this server can be attested by the root agent
pid: "host"
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: nestedA-server
labels:
# label to attest nestedA-server against root-agent
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/nested-spire/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
services:
# Root
root-server:
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: root-server
volumes:
- ./root/server:/opt/spire/conf/server
command: ["-config", "/opt/spire/conf/server/server.conf"]
root-agent:
# Share the host pid namespace so this agent can attest the nested servers
pid: "host"
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
depends_on: ["root-server"]
hostname: root-agent
volumes:
Expand All @@ -22,7 +22,7 @@ services:
nestedA-server:
# Share the host pid namespace so this server can be attested by the root agent
pid: "host"
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: nestedA-server
labels:
# label to attest server against root-agent
Expand All @@ -34,7 +34,7 @@ services:
- ./nestedA/server:/opt/spire/conf/server
command: ["-config", "/opt/spire/conf/server/server.conf"]
nestedA-agent:
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
hostname: nestedA-agent
depends_on: ["nestedA-server"]
volumes:
Expand All @@ -44,7 +44,7 @@ services:
nestedB-server:
# Share the host pid namespace so this server can be attested by the root agent
pid: "host"
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
hostname: nestedB-server
depends_on: ["root-server","root-agent"]
labels:
Expand All @@ -56,7 +56,7 @@ services:
- ./nestedB/server:/opt/spire/conf/server
command: ["-config", "/opt/spire/conf/server/server.conf"]
nestedB-agent:
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
hostname: nestedB-agent
depends_on: ["nestedB-server"]
volumes:
Expand Down
2 changes: 1 addition & 1 deletion k8s/oidc-aws/agent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
args: ["-t", "30", "spire-server:8081"]
containers:
- name: spire-agent
image: ghcr.io/spiffe/spire-agent:1.5.1
image: ghcr.io/spiffe/spire-agent:1.15.5
args: ["-config", "/run/spire/config/agent.conf"]
volumeMounts:
- name: spire-config
Expand Down
4 changes: 2 additions & 2 deletions k8s/oidc-aws/server-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
shareProcessNamespace: true
containers:
- name: spire-server
image: ghcr.io/spiffe/spire-server:1.5.1
image: ghcr.io/spiffe/spire-server:1.15.5
args:
- -config
- /run/spire/config/server.conf
Expand Down Expand Up @@ -52,7 +52,7 @@ spec:
initialDelaySeconds: 5
periodSeconds: 5
- name: spire-oidc
image: ghcr.io/spiffe/oidc-discovery-provider:1.5.1
image: ghcr.io/spiffe/oidc-discovery-provider:1.15.5
args:
- -config
- /run/spire/oidc/config/oidc-discovery-provider.conf
Expand Down
4 changes: 2 additions & 2 deletions k8s/oidc-vault/k8s/server-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
shareProcessNamespace: true
containers:
- name: spire-server
image: ghcr.io/spiffe/spire-server:1.5.1
image: ghcr.io/spiffe/spire-server:1.15.5
args:
- -config
- /run/spire/config/server.conf
Expand Down Expand Up @@ -52,7 +52,7 @@ spec:
initialDelaySeconds: 5
periodSeconds: 5
- name: spire-oidc
image: ghcr.io/spiffe/oidc-discovery-provider:1.5.1
image: ghcr.io/spiffe/oidc-discovery-provider:1.15.5
args:
- -config
- /run/spire/oidc/config/oidc-discovery-provider.conf
Expand Down
2 changes: 1 addition & 1 deletion k8s/quickstart/agent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
args: ["-t", "30", "spire-server:8081"]
containers:
- name: spire-agent
image: ghcr.io/spiffe/spire-agent:1.11.2
image: ghcr.io/spiffe/spire-agent:1.15.5
args: ["-config", "/run/spire/config/agent.conf"]
env:
- name: MY_NODE_NAME
Expand Down
2 changes: 1 addition & 1 deletion k8s/quickstart/client-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: client
image: ghcr.io/spiffe/spire-agent:1.5.1
image: ghcr.io/spiffe/spire-agent:1.15.5
command: ["/opt/spire/bin/spire-agent"]
args: [ "api", "watch", "-socketPath", "/run/spire/sockets/agent.sock" ]
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion k8s/quickstart/server-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
fsGroup: 1000
containers:
- name: spire-server
image: ghcr.io/spiffe/spire-server:1.11.2
image: ghcr.io/spiffe/spire-server:1.15.5
args:
- -config
- /run/spire/config/server.conf
Expand Down
Loading