File tree 2 files changed +16
-19
lines changed
2 files changed +16
-19
lines changed Original file line number Diff line number Diff line change @@ -21,20 +21,20 @@ spec:
21
21
shareProcessNamespace : true
22
22
containers :
23
23
- name : hpcs-server
24
- image : ghcr.io/cscfi/hpcs/server:k8s_plan
24
+ image : ghcr.io/cscfi/hpcs/server:0.1.1
25
25
ports :
26
26
- containerPort : 10080
27
27
name : hpcs-server
28
28
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
38
38
volumes :
39
39
- name : hpcs-server-configs
40
40
configMap :
@@ -46,10 +46,10 @@ spec:
46
46
- name : hpcs-spire-agent-token
47
47
projected :
48
48
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
53
53
volumeClaimTemplates :
54
54
- metadata :
55
55
name : spire-agent-data
Original file line number Diff line number Diff line change 6
6
get_server_identity_JWT ,
7
7
validate_client_JWT_SVID ,
8
8
)
9
- from lib import spire_interactions
9
+ from lib import spire_interactions
10
10
from tools .docker_utils import get_build_env_image_digests
11
11
from pyspiffe .spiffe_id .spiffe_id import SpiffeId
12
12
from pyspiffe .workloadapi import default_jwt_source
31
31
"spire-server-bin"
32
32
]
33
33
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
-
38
34
if configuration ["spire-agent" ].get ("spire-agent-socket" ):
39
35
spire_interactions .jwt_workload_api = default_jwt_source .DefaultJwtSource (
40
36
workload_api_client = None ,
41
37
spiffe_socket_path = f"unix://{ configuration ['spire-agent' ].get ('spire-agent-socket' )} " ,
42
38
timeout_in_seconds = None ,
43
39
)
40
+
44
41
else :
45
42
spire_interactions .jwt_workload_api = default_jwt_source .DefaultJwtSource (
46
43
workload_api_client = None ,
You can’t perform that action at this time.
0 commit comments