From fcd07446370f31d304174d51c2a35dda15e0f95f Mon Sep 17 00:00:00 2001 From: "red-hat-konflux[bot]" <126015336+red-hat-konflux[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 12:22:05 +0000 Subject: [PATCH] NO-ISSUE: Update github.com/openshift/assisted-service/api digest to 92c71df Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../api/v1beta1/agent_types.go | 14 +++++++++++++ .../api/v1beta1/zz_generated.deepcopy.go | 20 +++++++++++++++++++ vendor/modules.txt | 4 ++-- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index fb2efbe2a..3b6b20172 100644 --- a/go.mod +++ b/go.mod @@ -141,7 +141,7 @@ require ( ) replace ( - github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20251209011235-28a9e58dea34 + github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20260116093747-92c71df8daee github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20251208131030-ae39457e926d github.com/openshift/cluster-api-provider-agent/api => ./api // CVE-2025-22868 diff --git a/go.sum b/go.sum index fc7dd86ab..299a8df1b 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316 h1:iJ1OkAUvFbQPB6qWRDxrH1jj8iA9GA/Jx2vYz7o+i1E= github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= -github.com/openshift/assisted-service/api v0.0.0-20251209011235-28a9e58dea34 h1:ZPGdYqCGHI8ncEmZ+8lczn8mceuLu8dfnsRgCTjSO4c= -github.com/openshift/assisted-service/api v0.0.0-20251209011235-28a9e58dea34/go.mod h1:796XMQuWnc8XIn3CgRJk3m2g5V3wjcUHrsqDEezE/SE= +github.com/openshift/assisted-service/api v0.0.0-20260116093747-92c71df8daee h1:IPjKem1nx+AFfn7xLzjWJrO0jgrv4qBtBJ+1WHLGzv8= +github.com/openshift/assisted-service/api v0.0.0-20260116093747-92c71df8daee/go.mod h1:RwFjD2uVjwKi/QcCRxZ7ixg13sy1jLskdKy9h3OshdY= github.com/openshift/assisted-service/models v0.0.0-20251208131030-ae39457e926d h1:DOJb+R/Hfwc16uqm24OBNj2jUt06KtczoVWwUxWlUyE= github.com/openshift/assisted-service/models v0.0.0-20251208131030-ae39457e926d/go.mod h1:5EkIueBSaLnt64HR8drgSewdm+GeuE7W5mr9pa2JXXk= github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 h1:cHyxR+Y8rAMT6m1jQCaYGRwikqahI0OjjUDhFNf3ySQ= diff --git a/vendor/github.com/openshift/assisted-service/api/v1beta1/agent_types.go b/vendor/github.com/openshift/assisted-service/api/v1beta1/agent_types.go index 24d0f0694..eca9a9c45 100644 --- a/vendor/github.com/openshift/assisted-service/api/v1beta1/agent_types.go +++ b/vendor/github.com/openshift/assisted-service/api/v1beta1/agent_types.go @@ -165,6 +165,19 @@ type HostSystemVendor struct { Virtual bool `json:"virtual,omitempty"` } +type HostGpu struct { + // Device address (for example "0000:00:02.0") + Address string `json:"address,omitempty"` + // ID of the device (for example "3ea0") + DeviceID string `json:"deviceID,omitempty"` + // Product name of the device (for example "UHD Graphics 620 (Whiskey Lake)") + Name string `json:"name,omitempty"` + // The name of the device vendor (for example "Intel Corporation") + Vendor string `json:"vendor,omitempty"` + // ID of the vendor (for example "8086") + VendorID string `json:"vendorID,omitempty"` +} + type HostInventory struct { // Name in REST API: timestamp ReportTime *metav1.Time `json:"reportTime,omitempty"` @@ -177,6 +190,7 @@ type HostInventory struct { Disks []HostDisk `json:"disks,omitempty"` Boot HostBoot `json:"boot,omitempty"` SystemVendor HostSystemVendor `json:"systemVendor,omitempty"` + Gpus []HostGpu `json:"gpus,omitempty"` } // AgentSpec defines the desired state of Agent diff --git a/vendor/github.com/openshift/assisted-service/api/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/openshift/assisted-service/api/v1beta1/zz_generated.deepcopy.go index 02b3b1c83..5e6f678e2 100644 --- a/vendor/github.com/openshift/assisted-service/api/v1beta1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/assisted-service/api/v1beta1/zz_generated.deepcopy.go @@ -586,6 +586,21 @@ func (in *HostDisk) DeepCopy() *HostDisk { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *HostGpu) DeepCopyInto(out *HostGpu) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostGpu. +func (in *HostGpu) DeepCopy() *HostGpu { + if in == nil { + return nil + } + out := new(HostGpu) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HostIOPerf) DeepCopyInto(out *HostIOPerf) { *out = *in @@ -676,6 +691,11 @@ func (in *HostInventory) DeepCopyInto(out *HostInventory) { } out.Boot = in.Boot out.SystemVendor = in.SystemVendor + if in.Gpus != nil { + in, out := &in.Gpus, &out.Gpus + *out = make([]HostGpu, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostInventory. diff --git a/vendor/modules.txt b/vendor/modules.txt index 60b96799f..bb79f342a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -245,7 +245,7 @@ github.com/openshift/api/config/v1 github.com/openshift/api/machine/v1 github.com/openshift/api/machine/v1beta1 github.com/openshift/api/operator/v1 -# github.com/openshift/assisted-service/api v0.0.0 => github.com/openshift/assisted-service/api v0.0.0-20251209011235-28a9e58dea34 +# github.com/openshift/assisted-service/api v0.0.0 => github.com/openshift/assisted-service/api v0.0.0-20260116093747-92c71df8daee ## explicit; go 1.21 github.com/openshift/assisted-service/api/common github.com/openshift/assisted-service/api/hiveextension/v1beta1 @@ -1015,7 +1015,7 @@ sigs.k8s.io/structured-merge-diff/v6/value # sigs.k8s.io/yaml v1.6.0 ## explicit; go 1.22 sigs.k8s.io/yaml -# github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20251209011235-28a9e58dea34 +# github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20260116093747-92c71df8daee # github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20251208131030-ae39457e926d # github.com/openshift/cluster-api-provider-agent/api => ./api # golang.org/x/oauth2 => github.com/openshift/golang-oauth2 v0.26.1-0.20250310184649-06a918c6239d