Skip to content

Commit d39d585

Browse files
committed
adding a deployment ansible script for hpcs server and bumping server version
1 parent aff36f6 commit d39d585

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

k8s/hpcs-server-statefulset.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ spec:
2121
shareProcessNamespace: true
2222
containers:
2323
- name: hpcs-server
24-
image: ghcr.io/cscfi/hpcs/server:k8s_plan
24+
image: ghcr.io/cscfi/hpcs/server:0.1.1
2525
ports:
2626
- containerPort: 10080
2727
name: hpcs-server
2828
volumeMounts:
29-
- name: hpcs-server-configs
30-
mountPath: /tmp/
31-
readOnly: false
32-
- name: hpcs-spire-sockets
33-
mountPath: /var/run/sockets
34-
readOnly: false
35-
- name: hpcs-spire-agent-token
36-
mountPath: /var/run/secrets/tokens
37-
readOnly: true
29+
- name: hpcs-server-configs
30+
mountPath: /tmp/
31+
readOnly: false
32+
- name: hpcs-spire-sockets
33+
mountPath: /var/run/sockets
34+
readOnly: false
35+
- name: hpcs-spire-agent-token
36+
mountPath: /var/run/secrets/tokens
37+
readOnly: true
3838
volumes:
3939
- name: hpcs-server-configs
4040
configMap:
@@ -46,10 +46,10 @@ spec:
4646
- name: hpcs-spire-agent-token
4747
projected:
4848
sources:
49-
- serviceAccountToken:
50-
path: spire-agent
51-
expirationSeconds: 7200
52-
audience: spire-server
49+
- serviceAccountToken:
50+
path: spire-agent
51+
expirationSeconds: 7200
52+
audience: spire-server
5353
volumeClaimTemplates:
5454
- metadata:
5555
name: spire-agent-data

server/app.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
get_server_identity_JWT,
77
validate_client_JWT_SVID,
88
)
9-
from lib import spire_interactions
9+
from lib import spire_interactions
1010
from tools.docker_utils import get_build_env_image_digests
1111
from pyspiffe.spiffe_id.spiffe_id import SpiffeId
1212
from pyspiffe.workloadapi import default_jwt_source
@@ -31,16 +31,13 @@
3131
"spire-server-bin"
3232
]
3333

34-
if configuration["spire-server"].get("pre-command"):
35-
spire_interactions.pre_command = configuration["spire-server"]["pre-command"]
36-
if configuration["spire-server"]["pre-command"] == '""':
37-
3834
if configuration["spire-agent"].get("spire-agent-socket"):
3935
spire_interactions.jwt_workload_api = default_jwt_source.DefaultJwtSource(
4036
workload_api_client=None,
4137
spiffe_socket_path=f"unix://{configuration['spire-agent'].get('spire-agent-socket')}",
4238
timeout_in_seconds=None,
4339
)
40+
4441
else:
4542
spire_interactions.jwt_workload_api = default_jwt_source.DefaultJwtSource(
4643
workload_api_client=None,

0 commit comments

Comments
 (0)