Skip to content

Commit 3038a70

Browse files
authored
upadate libyavirt(support tls and simple auth for yavirt) (#607)
1 parent 5a76c4f commit 3038a70

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

engine/virt/virt.go

+17-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"encoding/json"
77
"fmt"
88
"io"
9+
"os"
910
"strconv"
1011
"strings"
1112
"time"
@@ -43,7 +44,7 @@ type Virt struct {
4344
}
4445

4546
// MakeClient makes a virt. client which wraps yavirt API client.
46-
func MakeClient(_ context.Context, config coretypes.Config, _, endpoint, _, _, _ string) (engine.API, error) {
47+
func MakeClient(_ context.Context, config coretypes.Config, nodename, endpoint, ca, _, _ string) (engine.API, error) {
4748
var uri string
4849
switch {
4950
case strings.HasPrefix(endpoint, HTTPPrefixKey):
@@ -54,7 +55,21 @@ func MakeClient(_ context.Context, config coretypes.Config, _, endpoint, _, _, _
5455
return nil, coretypes.ErrInvaildEngineEndpoint
5556
}
5657

57-
cli, err := virtapi.New(uri)
58+
yCfg := &virttypes.Config{
59+
URI: uri,
60+
}
61+
if ca != "" {
62+
caFile, err := os.CreateTemp(config.CertPath, fmt.Sprintf("ca-%s", nodename))
63+
if err != nil {
64+
return nil, err
65+
}
66+
if _, err := caFile.WriteString(ca); err != nil {
67+
return nil, err
68+
}
69+
defer os.Remove(caFile.Name())
70+
yCfg.CA = caFile.Name()
71+
}
72+
cli, err := virtapi.New(yCfg)
5873
if err != nil {
5974
return nil, err
6075
}

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
2424
github.com/panjf2000/ants/v2 v2.7.3
2525
github.com/patrickmn/go-cache v2.1.0+incompatible
26-
github.com/projecteru2/libyavirt v0.0.0-20230705102231-8199e310da06
26+
github.com/projecteru2/libyavirt v0.0.0-20230725071905-9785e974d625
2727
github.com/prometheus/client_golang v1.15.0
2828
github.com/rs/zerolog v1.29.1
2929
github.com/sanity-io/litter v1.5.5

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
459459
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
460460
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
461461
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
462-
github.com/projecteru2/libyavirt v0.0.0-20230705102231-8199e310da06 h1:p/1vyEftIPf9LPuMMr7STDllXlVzrWc1eUHHuUPcE9o=
463-
github.com/projecteru2/libyavirt v0.0.0-20230705102231-8199e310da06/go.mod h1:N41KaKmqbailweGs4x/mt2H0O0Y7MizObZQ+igLdzpw=
462+
github.com/projecteru2/libyavirt v0.0.0-20230725071905-9785e974d625 h1:liDnxQ0JxvOLC0/tUVRlz4tG9r/xbcp1NXgNVNBJsLQ=
463+
github.com/projecteru2/libyavirt v0.0.0-20230725071905-9785e974d625/go.mod h1:N41KaKmqbailweGs4x/mt2H0O0Y7MizObZQ+igLdzpw=
464464
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
465465
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
466466
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

0 commit comments

Comments
 (0)