diff --git a/cli/internal/helm/client.go b/cli/internal/helm/client.go index 5057f3305..fa0e6ef44 100644 --- a/cli/internal/helm/client.go +++ b/cli/internal/helm/client.go @@ -16,7 +16,7 @@ import ( "github.com/edgelesssys/marblerun/util/k8sutil" "github.com/gofrs/flock" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "helm.sh/helm/v4/pkg/action" "helm.sh/helm/v4/pkg/chart/common/util" chart "helm.sh/helm/v4/pkg/chart/v2" @@ -107,7 +107,8 @@ func UpdateValues(options Options, chartValues map[string]any) (map[string]any, if options.SimulationMode { // simulation mode, disable tolerations and resources, set simulation to true - stringValues = append(stringValues, + stringValues = append( + stringValues, fmt.Sprintf("tolerations=%s", "null"), fmt.Sprintf("coordinator.simulation=%t", options.SimulationMode), fmt.Sprintf("coordinator.resources.limits=%s", "null"), @@ -117,7 +118,8 @@ func UpdateValues(options Options, chartValues map[string]any) (map[string]any, if options.QCNLConfigFile != "" { fileValues = append(fileValues, fmt.Sprintf("dcap.qcnlConfig=%s", options.QCNLConfigFile)) } else { - stringValues = append(stringValues, + stringValues = append( + stringValues, fmt.Sprintf("dcap.pccsUrl=%s", options.PCCSURL), fmt.Sprintf("dcap.useSecureCert=%s", options.UseSecureCert), ) @@ -149,7 +151,8 @@ func UpdateValues(options Options, chartValues map[string]any) (map[string]any, idx++ } if needToleration { - stringValues = append(stringValues, + stringValues = append( + stringValues, fmt.Sprintf("tolerations[%d].key=%s", idx, options.SGXResourceKey), fmt.Sprintf("tolerations[%d].operator=Exists", idx), fmt.Sprintf("tolerations[%d].effect=NoSchedule", idx), diff --git a/go.mod b/go.mod index 088c07503..6240d6e32 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.5.0 github.com/cert-manager/cert-manager v1.21.1 github.com/eclipse-keypont/crypto11 v1.6.8 - github.com/edgelesssys/ego v1.9.0 + github.com/edgelesssys/ego v1.9.1 github.com/gofrs/flock v0.13.1 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 @@ -16,7 +16,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.4 github.com/lestrrat-go/jwx/v3 v3.2.0 github.com/prometheus/client_golang v1.24.1 - github.com/prometheus/client_model v0.6.2 + github.com/prometheus/client_model v0.6.3 github.com/spf13/afero v1.15.0 github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 @@ -25,10 +25,10 @@ require ( github.com/tink-crypto/tink-go/v2 v2.8.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.28.0 + go.yaml.in/yaml/v3 v3.0.5 golang.org/x/sys v0.47.0 google.golang.org/grpc v1.83.2 google.golang.org/protobuf v1.36.12 - gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v4 v4.2.4 k8s.io/api v0.37.0 k8s.io/apimachinery v0.37.0 @@ -156,7 +156,6 @@ require ( go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect - go.yaml.in/yaml/v3 v3.0.5 // indirect golang.org/x/crypto v0.55.0 // indirect golang.org/x/net v0.58.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect diff --git a/go.sum b/go.sum index dfd8e9fde..1065c2eb4 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1 h1:idfl8M8r github.com/dylibso/observe-sdk/go v0.0.0-20240828172851-9145d8ad07e1/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q= github.com/eclipse-keypont/crypto11 v1.6.8 h1:4OE1GSUYFWbZb27S2+Glj6bQpiPND5BfnPIFxOCIkKU= github.com/eclipse-keypont/crypto11 v1.6.8/go.mod h1:NIBgfiTuqvCyaktz22yE33PB4Aa0dU0M2Uf6QUTfDFk= -github.com/edgelesssys/ego v1.9.0 h1:BJyJaBWc74Zxt+M/O1sGhOee9TtM+0YBCtRSEM6E+fA= -github.com/edgelesssys/ego v1.9.0/go.mod h1:fg0M/xfLWnrkoD2OZpY9xmltGlAPFsIiUmyHTuCS7zo= +github.com/edgelesssys/ego v1.9.1 h1:ed0qUpnb8HSgC1G5DLbPmEqltBWg2a8SrGQiiQV3va8= +github.com/edgelesssys/ego v1.9.1/go.mod h1:3HtcPcVl3VG3wl11k6mSpVoZI7gx02Yh6GqMBAngChY= github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes= github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= @@ -328,8 +328,8 @@ github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU= github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE= -github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= -github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= +github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo= +github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM= github.com/prometheus/common v0.70.1 h1:1HvjP4D5oL3t8RsPlwxA9onvvStjtIHYE5XuuwOi/PY= github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc= github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos= @@ -499,8 +499,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= helm.sh/helm/v4 v4.2.4 h1:qIysMI0JpTC4WXf3AQ99V6rZGT0+gO0Ww8IOnnUnaZk= helm.sh/helm/v4 v4.2.4/go.mod h1:ZP8nFdYe7jG1PTQelKzQXQ7m09/ruhMTrpDAf+OL5ms= k8s.io/api v0.37.0 h1:Z//Vj9N7RA/yS2sDmxyeo7h+RR4zbUrd2vrd3Z0TbB4= diff --git a/samples/estore/go.mod b/samples/estore/go.mod index b38815388..72c53e11a 100644 --- a/samples/estore/go.mod +++ b/samples/estore/go.mod @@ -4,7 +4,7 @@ go 1.26.1 replace github.com/edgelesssys/marblerun => ../../ -replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20260825221802-da73d73af1c5 +replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20260831171406-18b4a7587f8a require ( github.com/edgelesssys/estore v1.2.0 @@ -18,7 +18,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect - github.com/edgelesssys/ego v1.9.0 // indirect + github.com/edgelesssys/ego v1.9.1 // indirect github.com/getsentry/sentry-go v0.29.1 // indirect github.com/go-jose/go-jose/v4 v4.1.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -30,7 +30,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.24.1 // indirect - github.com/prometheus/client_model v0.6.2 // indirect + github.com/prometheus/client_model v0.6.3 // indirect github.com/prometheus/common v0.70.1 // indirect github.com/prometheus/procfs v0.21.1 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect diff --git a/samples/estore/go.sum b/samples/estore/go.sum index b9d163755..1da1bf545 100644 --- a/samples/estore/go.sum +++ b/samples/estore/go.sum @@ -13,8 +13,8 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/edgelesssys/ego v1.9.0 h1:BJyJaBWc74Zxt+M/O1sGhOee9TtM+0YBCtRSEM6E+fA= -github.com/edgelesssys/ego v1.9.0/go.mod h1:fg0M/xfLWnrkoD2OZpY9xmltGlAPFsIiUmyHTuCS7zo= +github.com/edgelesssys/ego v1.9.1 h1:ed0qUpnb8HSgC1G5DLbPmEqltBWg2a8SrGQiiQV3va8= +github.com/edgelesssys/ego v1.9.1/go.mod h1:3HtcPcVl3VG3wl11k6mSpVoZI7gx02Yh6GqMBAngChY= github.com/edgelesssys/estore v1.2.0 h1:QIpEme6/ZG/aq1C51kUDKVC5VARAr2bg34aa75WLVF0= github.com/edgelesssys/estore v1.2.0/go.mod h1:X6YRliq5kd5j6fvhR9F3SQJthIXzw5xgZSVU+lHx8TM= github.com/getsentry/sentry-go v0.29.1 h1:DyZuChN8Hz3ARxGVV8ePaNXh1dQ7d76AiB117xcREwA= @@ -48,8 +48,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU= github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE= -github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= -github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= +github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo= +github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM= github.com/prometheus/common v0.70.1 h1:1HvjP4D5oL3t8RsPlwxA9onvvStjtIHYE5XuuwOi/PY= github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc= github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI= @@ -116,7 +116,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20260825221802-da73d73af1c5 h1:jPP56YzdY899KJ5W7efXHt/CkjlVfAaoFOwdi/IEAFA= +google.golang.org/genproto v0.0.0-20260831171406-18b4a7587f8a h1:d5Vqs7VNOkWqGjSrJDOsHsLOm9Z0lAn+xHX7TCEcFmk= google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad h1:45WmJvIV6C2+O/jjLkPUH+F3aOj/1miDoU2DD0+NWbg= google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=