From a8be826a228bc6458a1c9c39395b41857d6417e0 Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Sun, 10 Mar 2024 09:45:49 +0200 Subject: [PATCH 1/2] Do not override description of wrapped error The liberr.Wrap function should get an odd number of arguments, otherwise the description of the specified error would be overridden (follow-up on #772). Signed-off-by: Arik Hadas --- pkg/controller/plan/adapter/ovirt/builder.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/controller/plan/adapter/ovirt/builder.go b/pkg/controller/plan/adapter/ovirt/builder.go index d764aab47..5eaf135f7 100644 --- a/pkg/controller/plan/adapter/ovirt/builder.go +++ b/pkg/controller/plan/adapter/ovirt/builder.go @@ -735,8 +735,7 @@ func (r *Builder) PopulatorVolumes(vmRef ref.Ref, annotations map[string]string, pvc, err = r.persistentVolumeClaimWithSourceRef(diskAttachment, storageClassName, populatorName, annotations) if err != nil { if !k8serr.IsAlreadyExists(err) { - err = liberr.Wrap(err, "couldn't build the PVC", "diskAttachmentID", diskAttachment.DiskAttachment.ID, - "storageClassName", storageClassName, "populatorName", populatorName) + err = liberr.Wrap(err, "disk attachment", diskAttachment.DiskAttachment.ID, "storage class", storageClassName, "populator", populatorName) return } err = nil From 31aaae892bef2ccaa30e8459032d46fa87ce6cb5 Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Sun, 10 Mar 2024 10:52:49 +0200 Subject: [PATCH 2/2] bump OPA version to get security fixes Signed-off-by: Arik Hadas --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ab8564030..2053a7279 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3356,8 +3356,8 @@ http_file( name = "opa", downloaded_file_path = "opa", executable = True, - sha256 = "7bb75b14c9bcb5798d42bed5fc45c438ee5bb783894733ce553ba3445f66034f", - urls = ["https://openpolicyagent.org/downloads/v0.58.0/opa_linux_amd64_static"], + sha256 = "8951c2055324e4eab8c3ef1abf35248c25cc183e27208412ed3b92c9e06a919c", + urls = ["https://openpolicyagent.org/downloads/v0.62.1/opa_linux_amd64_static"], ) http_file(