github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-16 06:18:58 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Support policy in remote hypervisor

Browse Source 
Move the `sandbox.agent.setPolicy` call out of the remoteHypervisor
if, block, so we can use the policy implementation on peer pods

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2024-06-19 14:09:47 +01:00
parent beab17f765
commit 779754dcf6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/runtime/virtcontainers/kata_agent.go
View File

@@ -766,19 +766,21 @@ func (k *kataAgent) startSandbox(ctx context.Context, sandbox *Sandbox) error {
if sandbox.config.HypervisorType == RemoteHypervisor { if sandbox.config.HypervisorType == RemoteHypervisor {
ctx = context.WithValue(ctx, customRequestTimeoutKey, remoteRequestTimeout) ctx = context.WithValue(ctx, customRequestTimeoutKey, remoteRequestTimeout)
} else { }
// Check grpc server is serving
if err = k.check(ctx); err != nil { // Check grpc server is serving
if err = k.check(ctx); err != nil {
return err
}
// If a Policy has been specified, send it to the agent.
if len(sandbox.config.AgentConfig.Policy) > 0 {
if err := sandbox.agent.setPolicy(ctx, sandbox.config.AgentConfig.Policy); err != nil {
return err return err
} }
}
// If a Policy has been specified, send it to the agent. if sandbox.config.HypervisorType != RemoteHypervisor {
if len(sandbox.config.AgentConfig.Policy) > 0 {
if err := sandbox.agent.setPolicy(ctx, sandbox.config.AgentConfig.Policy); err != nil {
return err
}
}
// Setup network interfaces and routes // Setup network interfaces and routes
interfaces, routes, neighs, err := generateVCNetworkStructures(ctx, sandbox.network) interfaces, routes, neighs, err := generateVCNetworkStructures(ctx, sandbox.network)
if err != nil { if err != nil {