From 0362582555816866dee9cb3dad5619d877eacbe2 Mon Sep 17 00:00:00 2001 From: "red-hat-konflux[bot]" <126015336+red-hat-konflux[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 00:14:31 +0000 Subject: [PATCH] NO-ISSUE: Update github.com/openshift/assisted-service/models digest to 11da925 Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 +- .../assisted-service/models/cluster.go | 15 ++- .../disconnected_cluster_create_params.go | 98 +++++++++++++++++++ .../assisted-service/models/image_type.go | 5 +- vendor/modules.txt | 4 +- 6 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 vendor/github.com/openshift/assisted-service/models/disconnected_cluster_create_params.go diff --git a/go.mod b/go.mod index 71ab6279..ad1812fd 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( replace ( github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20250828154955-d72721521558 - github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20250821113912-5ad96ae324a1 + github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20250914191355-11da925695d5 github.com/openshift/cluster-api-provider-agent/api => ./api // CVE-2025-22868 diff --git a/go.sum b/go.sum index 0b680fdd..53dcf88f 100644 --- a/go.sum +++ b/go.sum @@ -324,8 +324,8 @@ github.com/openshift/assisted-service v1.0.10-0.20250821113912-5ad96ae324a1 h1:Q github.com/openshift/assisted-service v1.0.10-0.20250821113912-5ad96ae324a1/go.mod h1:WqZdNoOgM3VmNloI93f7peWHC/8elm7Sj68liPuTYJI= github.com/openshift/assisted-service/api v0.0.0-20250828154955-d72721521558 h1:h9H9HVRgMA0eObHQWD6tETqS0oYKxW5nfP8B862c5uA= github.com/openshift/assisted-service/api v0.0.0-20250828154955-d72721521558/go.mod h1:tvE25aC7I07Uz2jUt7gH2E8+a1Rw4W7qtW6/EFb8l64= -github.com/openshift/assisted-service/models v0.0.0-20250821113912-5ad96ae324a1 h1:BMicey6mmYdaKOZ4xLpftSV995UPP5WeF0oyhINEvsw= -github.com/openshift/assisted-service/models v0.0.0-20250821113912-5ad96ae324a1/go.mod h1:bx9NsPeBkhn7az/qFHo3hW8wFqFj4BmT3g1R7wR9gcw= +github.com/openshift/assisted-service/models v0.0.0-20250914191355-11da925695d5 h1:h2iivVOklXJT687aARe85wz+x+twMYq8al/VDzivi1c= +github.com/openshift/assisted-service/models v0.0.0-20250914191355-11da925695d5/go.mod h1:bx9NsPeBkhn7az/qFHo3hW8wFqFj4BmT3g1R7wR9gcw= github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 h1:cHyxR+Y8rAMT6m1jQCaYGRwikqahI0OjjUDhFNf3ySQ= github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= github.com/openshift/golang-oauth2 v0.26.1-0.20250310184649-06a918c6239d h1:iQfTKBmMcwFTxxVWV7U/C6GqgIIWTKD8l5HXslvn53s= diff --git a/vendor/github.com/openshift/assisted-service/models/cluster.go b/vendor/github.com/openshift/assisted-service/models/cluster.go index db66bfca..c75142b4 100644 --- a/vendor/github.com/openshift/assisted-service/models/cluster.go +++ b/vendor/github.com/openshift/assisted-service/models/cluster.go @@ -166,9 +166,10 @@ type Cluster struct { // Indicates the type of this object. Will be 'Cluster' if this is a complete object, // 'AddHostsCluster' for cluster that add hosts to existing OCP cluster, + // 'DisconnectedCluster' for clusters with embedded ignition for offline installation, // // Required: true - // Enum: [Cluster AddHostsCluster] + // Enum: [Cluster AddHostsCluster DisconnectedCluster] Kind *string `json:"kind"` // last installation preparation @@ -248,7 +249,7 @@ type Cluster struct { // Status of the OpenShift cluster. // Required: true - // Enum: [insufficient ready error preparing-for-installation pending-for-input installing finalizing installed adding-hosts cancelled installing-pending-user-action] + // Enum: [insufficient ready error preparing-for-installation pending-for-input installing finalizing installed adding-hosts cancelled installing-pending-user-action unmonitored] Status *string `json:"status"` // Additional information pertaining to the status of the OpenShift cluster. @@ -917,7 +918,7 @@ var clusterTypeKindPropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["Cluster","AddHostsCluster"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["Cluster","AddHostsCluster","DisconnectedCluster"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -932,6 +933,9 @@ const ( // ClusterKindAddHostsCluster captures enum value "AddHostsCluster" ClusterKindAddHostsCluster string = "AddHostsCluster" + + // ClusterKindDisconnectedCluster captures enum value "DisconnectedCluster" + ClusterKindDisconnectedCluster string = "DisconnectedCluster" ) // prop value enum @@ -1207,7 +1211,7 @@ var clusterTypeStatusPropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["insufficient","ready","error","preparing-for-installation","pending-for-input","installing","finalizing","installed","adding-hosts","cancelled","installing-pending-user-action"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["insufficient","ready","error","preparing-for-installation","pending-for-input","installing","finalizing","installed","adding-hosts","cancelled","installing-pending-user-action","unmonitored"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -1249,6 +1253,9 @@ const ( // ClusterStatusInstallingPendingUserAction captures enum value "installing-pending-user-action" ClusterStatusInstallingPendingUserAction string = "installing-pending-user-action" + + // ClusterStatusUnmonitored captures enum value "unmonitored" + ClusterStatusUnmonitored string = "unmonitored" ) // prop value enum diff --git a/vendor/github.com/openshift/assisted-service/models/disconnected_cluster_create_params.go b/vendor/github.com/openshift/assisted-service/models/disconnected_cluster_create_params.go new file mode 100644 index 00000000..9ff6aab6 --- /dev/null +++ b/vendor/github.com/openshift/assisted-service/models/disconnected_cluster_create_params.go @@ -0,0 +1,98 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package models + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "context" + + "github.com/go-openapi/errors" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/swag" + "github.com/go-openapi/validate" +) + +// DisconnectedClusterCreateParams disconnected cluster create params +// +// swagger:model disconnected-cluster-create-params +type DisconnectedClusterCreateParams struct { + + // Name of the OpenShift cluster. + // Required: true + // Max Length: 54 + // Min Length: 1 + Name *string `json:"name"` + + // Version of the OpenShift cluster. + // Required: true + OpenshiftVersion *string `json:"openshift_version"` +} + +// Validate validates this disconnected cluster create params +func (m *DisconnectedClusterCreateParams) Validate(formats strfmt.Registry) error { + var res []error + + if err := m.validateName(formats); err != nil { + res = append(res, err) + } + + if err := m.validateOpenshiftVersion(formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *DisconnectedClusterCreateParams) validateName(formats strfmt.Registry) error { + + if err := validate.Required("name", "body", m.Name); err != nil { + return err + } + + if err := validate.MinLength("name", "body", *m.Name, 1); err != nil { + return err + } + + if err := validate.MaxLength("name", "body", *m.Name, 54); err != nil { + return err + } + + return nil +} + +func (m *DisconnectedClusterCreateParams) validateOpenshiftVersion(formats strfmt.Registry) error { + + if err := validate.Required("openshift_version", "body", m.OpenshiftVersion); err != nil { + return err + } + + return nil +} + +// ContextValidate validates this disconnected cluster create params based on context it is used +func (m *DisconnectedClusterCreateParams) ContextValidate(ctx context.Context, formats strfmt.Registry) error { + return nil +} + +// MarshalBinary interface implementation +func (m *DisconnectedClusterCreateParams) MarshalBinary() ([]byte, error) { + if m == nil { + return nil, nil + } + return swag.WriteJSON(m) +} + +// UnmarshalBinary interface implementation +func (m *DisconnectedClusterCreateParams) UnmarshalBinary(b []byte) error { + var res DisconnectedClusterCreateParams + if err := swag.ReadJSON(b, &res); err != nil { + return err + } + *m = res + return nil +} diff --git a/vendor/github.com/openshift/assisted-service/models/image_type.go b/vendor/github.com/openshift/assisted-service/models/image_type.go index 77e90349..97959258 100644 --- a/vendor/github.com/openshift/assisted-service/models/image_type.go +++ b/vendor/github.com/openshift/assisted-service/models/image_type.go @@ -35,6 +35,9 @@ const ( // ImageTypeMinimalIso captures enum value "minimal-iso" ImageTypeMinimalIso ImageType = "minimal-iso" + + // ImageTypeDisconnectedIso captures enum value "disconnected-iso" + ImageTypeDisconnectedIso ImageType = "disconnected-iso" ) // for schema @@ -42,7 +45,7 @@ var imageTypeEnum []interface{} func init() { var res []ImageType - if err := json.Unmarshal([]byte(`["full-iso","minimal-iso"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["full-iso","minimal-iso","disconnected-iso"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/vendor/modules.txt b/vendor/modules.txt index 59eb6d93..77ce14e2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -227,7 +227,7 @@ github.com/openshift/assisted-service/pkg/validations github.com/openshift/assisted-service/api/common github.com/openshift/assisted-service/api/hiveextension/v1beta1 github.com/openshift/assisted-service/api/v1beta1 -# github.com/openshift/assisted-service/models v0.0.0 => github.com/openshift/assisted-service/models v0.0.0-20250821113912-5ad96ae324a1 +# github.com/openshift/assisted-service/models v0.0.0 => github.com/openshift/assisted-service/models v0.0.0-20250914191355-11da925695d5 ## explicit; go 1.21 github.com/openshift/assisted-service/models # github.com/openshift/cluster-api-provider-agent/api v0.0.0-20250801140557-0bc32d8c31ab => ./api @@ -797,6 +797,6 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 # github.com/openshift/assisted-service/api => github.com/openshift/assisted-service/api v0.0.0-20250828154955-d72721521558 -# github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20250821113912-5ad96ae324a1 +# github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20250914191355-11da925695d5 # github.com/openshift/cluster-api-provider-agent/api => ./api # golang.org/x/oauth2 => github.com/openshift/golang-oauth2 v0.26.1-0.20250310184649-06a918c6239d