diff --git a/go.mod b/go.mod index 1a1e7409c..9ca5a5488 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/mark3labs/mcp-go v0.41.1 github.com/onsi/gomega v1.38.2 github.com/openshift/api v0.0.0-20251001120622-fa7b3724847a - github.com/openshift/client-go v0.0.0-20250915125341-81c9dc83a675 + github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597 github.com/pkg/errors v0.9.1 github.com/quay/claircore v1.5.42 github.com/spf13/cobra v1.10.1 diff --git a/go.sum b/go.sum index 0732bf22d..72a7e214a 100644 --- a/go.sum +++ b/go.sum @@ -292,8 +292,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/openshift/api v0.0.0-20251001120622-fa7b3724847a h1:DlW7D1JIQ84b2itY4LyYYLVyNVH7igwV8Rs1v6fXlO4= github.com/openshift/api v0.0.0-20251001120622-fa7b3724847a/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM= -github.com/openshift/client-go v0.0.0-20250915125341-81c9dc83a675 h1:FKrngDbpVX730LfBuPsN1KdD2BwtE+i1q2gwhKDMc80= -github.com/openshift/client-go v0.0.0-20250915125341-81c9dc83a675/go.mod h1:w7sV33ASK/HcuEb0Ll9qvChZdJwNwqo8GocVAnd7fVY= +github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597 h1:MpnTxVOnXFUfAjpa1bYblgftOsgF61KmxAmBmR+s3+s= +github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597/go.mod h1:xFmKmVC4oHFSbFMAjlBBhzyWqmroaRK36/qu9BpDDes= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= diff --git a/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go b/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go index a756da0a7..a5721a530 100644 --- a/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go +++ b/vendor/github.com/openshift/client-go/config/applyconfigurations/internal/internal.go @@ -3945,17 +3945,16 @@ var schemaYAML = typed.YAMLObject(`types: - name: customConfig type: namedType: com.github.openshift.api.config.v1alpha1.AlertmanagerCustomConfig + default: {} - name: deploymentMode type: scalar: string - default: "" - name: com.github.openshift.api.config.v1alpha1.AlertmanagerCustomConfig map: fields: - name: logLevel type: scalar: string - default: "" - name: nodeSelector type: map: @@ -3993,6 +3992,12 @@ var schemaYAML = typed.YAMLObject(`types: - name: volumeClaimTemplate type: namedType: io.k8s.api.core.v1.PersistentVolumeClaim +- name: com.github.openshift.api.config.v1alpha1.Audit + map: + fields: + - name: profile + type: + scalar: string - name: com.github.openshift.api.config.v1alpha1.Backup map: fields: @@ -4105,9 +4110,15 @@ var schemaYAML = typed.YAMLObject(`types: - name: alertmanagerConfig type: namedType: com.github.openshift.api.config.v1alpha1.AlertmanagerConfig + default: {} + - name: metricsServerConfig + type: + namedType: com.github.openshift.api.config.v1alpha1.MetricsServerConfig + default: {} - name: userDefined type: namedType: com.github.openshift.api.config.v1alpha1.UserDefinedMonitoring + default: {} - name: com.github.openshift.api.config.v1alpha1.ClusterMonitoringStatus map: elementType: @@ -4129,7 +4140,6 @@ var schemaYAML = typed.YAMLObject(`types: - name: name type: scalar: string - default: "" - name: request type: namedType: io.k8s.apimachinery.pkg.api.resource.Quantity @@ -4265,6 +4275,44 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable +- name: com.github.openshift.api.config.v1alpha1.MetricsServerConfig + map: + fields: + - name: audit + type: + namedType: com.github.openshift.api.config.v1alpha1.Audit + default: {} + - name: nodeSelector + type: + map: + elementType: + scalar: string + - name: resources + type: + list: + elementType: + namedType: com.github.openshift.api.config.v1alpha1.ContainerResource + elementRelationship: associative + keys: + - name + - name: tolerations + type: + list: + elementType: + namedType: io.k8s.api.core.v1.Toleration + elementRelationship: atomic + - name: topologySpreadConstraints + type: + list: + elementType: + namedType: io.k8s.api.core.v1.TopologySpreadConstraint + elementRelationship: associative + keys: + - topologyKey + - whenUnsatisfiable + - name: verbosity + type: + scalar: string - name: com.github.openshift.api.config.v1alpha1.PKI map: fields: diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go index 98dc0f0ce..81767cac9 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/internal/internal.go @@ -389,6 +389,42 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" +- name: com.github.openshift.api.operator.v1.BootImageSkewEnforcementConfig + map: + fields: + - name: manual + type: + namedType: com.github.openshift.api.operator.v1.ClusterBootImageManual + default: {} + - name: mode + type: + scalar: string + unions: + - discriminator: mode + fields: + - fieldName: manual + discriminatorValue: Manual +- name: com.github.openshift.api.operator.v1.BootImageSkewEnforcementStatus + map: + fields: + - name: automatic + type: + namedType: com.github.openshift.api.operator.v1.ClusterBootImageAutomatic + default: {} + - name: manual + type: + namedType: com.github.openshift.api.operator.v1.ClusterBootImageManual + default: {} + - name: mode + type: + scalar: string + unions: + - discriminator: mode + fields: + - fieldName: automatic + discriminatorValue: Automatic + - fieldName: manual + discriminatorValue: Manual - name: com.github.openshift.api.operator.v1.CSIDriverConfigSpec map: fields: @@ -614,6 +650,34 @@ var schemaYAML = typed.YAMLObject(`types: - name: version type: scalar: string +- name: com.github.openshift.api.operator.v1.ClusterBootImageAutomatic + map: + fields: + - name: ocpVersion + type: + scalar: string + - name: rhcosVersion + type: + scalar: string +- name: com.github.openshift.api.operator.v1.ClusterBootImageManual + map: + fields: + - name: mode + type: + scalar: string + - name: ocpVersion + type: + scalar: string + - name: rhcosVersion + type: + scalar: string + unions: + - discriminator: mode + fields: + - fieldName: ocpVersion + discriminatorValue: OCPVersion + - fieldName: rhcosVersion + discriminatorValue: RHCOSVersion - name: com.github.openshift.api.operator.v1.ClusterCSIDriver map: fields: @@ -2505,6 +2569,10 @@ var schemaYAML = typed.YAMLObject(`types: - name: com.github.openshift.api.operator.v1.MachineConfigurationSpec map: fields: + - name: bootImageSkewEnforcement + type: + namedType: com.github.openshift.api.operator.v1.BootImageSkewEnforcementConfig + default: {} - name: failedRevisionLimit type: scalar: numeric @@ -2546,6 +2614,10 @@ var schemaYAML = typed.YAMLObject(`types: - name: com.github.openshift.api.operator.v1.MachineConfigurationStatus map: fields: + - name: bootImageSkewEnforcementStatus + type: + namedType: com.github.openshift.api.operator.v1.BootImageSkewEnforcementStatus + default: {} - name: conditions type: list: diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementconfig.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementconfig.go new file mode 100644 index 000000000..b5b826de0 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementconfig.go @@ -0,0 +1,36 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1 + +import ( + operatorv1 "github.com/openshift/api/operator/v1" +) + +// BootImageSkewEnforcementConfigApplyConfiguration represents a declarative configuration of the BootImageSkewEnforcementConfig type for use +// with apply. +type BootImageSkewEnforcementConfigApplyConfiguration struct { + Mode *operatorv1.BootImageSkewEnforcementConfigMode `json:"mode,omitempty"` + Manual *ClusterBootImageManualApplyConfiguration `json:"manual,omitempty"` +} + +// BootImageSkewEnforcementConfigApplyConfiguration constructs a declarative configuration of the BootImageSkewEnforcementConfig type for use with +// apply. +func BootImageSkewEnforcementConfig() *BootImageSkewEnforcementConfigApplyConfiguration { + return &BootImageSkewEnforcementConfigApplyConfiguration{} +} + +// WithMode sets the Mode field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Mode field is set to the value of the last call. +func (b *BootImageSkewEnforcementConfigApplyConfiguration) WithMode(value operatorv1.BootImageSkewEnforcementConfigMode) *BootImageSkewEnforcementConfigApplyConfiguration { + b.Mode = &value + return b +} + +// WithManual sets the Manual field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Manual field is set to the value of the last call. +func (b *BootImageSkewEnforcementConfigApplyConfiguration) WithManual(value *ClusterBootImageManualApplyConfiguration) *BootImageSkewEnforcementConfigApplyConfiguration { + b.Manual = value + return b +} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementstatus.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementstatus.go new file mode 100644 index 000000000..ae50d44ca --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/bootimageskewenforcementstatus.go @@ -0,0 +1,45 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1 + +import ( + operatorv1 "github.com/openshift/api/operator/v1" +) + +// BootImageSkewEnforcementStatusApplyConfiguration represents a declarative configuration of the BootImageSkewEnforcementStatus type for use +// with apply. +type BootImageSkewEnforcementStatusApplyConfiguration struct { + Mode *operatorv1.BootImageSkewEnforcementModeStatus `json:"mode,omitempty"` + Automatic *ClusterBootImageAutomaticApplyConfiguration `json:"automatic,omitempty"` + Manual *ClusterBootImageManualApplyConfiguration `json:"manual,omitempty"` +} + +// BootImageSkewEnforcementStatusApplyConfiguration constructs a declarative configuration of the BootImageSkewEnforcementStatus type for use with +// apply. +func BootImageSkewEnforcementStatus() *BootImageSkewEnforcementStatusApplyConfiguration { + return &BootImageSkewEnforcementStatusApplyConfiguration{} +} + +// WithMode sets the Mode field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Mode field is set to the value of the last call. +func (b *BootImageSkewEnforcementStatusApplyConfiguration) WithMode(value operatorv1.BootImageSkewEnforcementModeStatus) *BootImageSkewEnforcementStatusApplyConfiguration { + b.Mode = &value + return b +} + +// WithAutomatic sets the Automatic field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Automatic field is set to the value of the last call. +func (b *BootImageSkewEnforcementStatusApplyConfiguration) WithAutomatic(value *ClusterBootImageAutomaticApplyConfiguration) *BootImageSkewEnforcementStatusApplyConfiguration { + b.Automatic = value + return b +} + +// WithManual sets the Manual field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Manual field is set to the value of the last call. +func (b *BootImageSkewEnforcementStatusApplyConfiguration) WithManual(value *ClusterBootImageManualApplyConfiguration) *BootImageSkewEnforcementStatusApplyConfiguration { + b.Manual = value + return b +} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimageautomatic.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimageautomatic.go new file mode 100644 index 000000000..58e7aa3ec --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimageautomatic.go @@ -0,0 +1,32 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1 + +// ClusterBootImageAutomaticApplyConfiguration represents a declarative configuration of the ClusterBootImageAutomatic type for use +// with apply. +type ClusterBootImageAutomaticApplyConfiguration struct { + OCPVersion *string `json:"ocpVersion,omitempty"` + RHCOSVersion *string `json:"rhcosVersion,omitempty"` +} + +// ClusterBootImageAutomaticApplyConfiguration constructs a declarative configuration of the ClusterBootImageAutomatic type for use with +// apply. +func ClusterBootImageAutomatic() *ClusterBootImageAutomaticApplyConfiguration { + return &ClusterBootImageAutomaticApplyConfiguration{} +} + +// WithOCPVersion sets the OCPVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the OCPVersion field is set to the value of the last call. +func (b *ClusterBootImageAutomaticApplyConfiguration) WithOCPVersion(value string) *ClusterBootImageAutomaticApplyConfiguration { + b.OCPVersion = &value + return b +} + +// WithRHCOSVersion sets the RHCOSVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the RHCOSVersion field is set to the value of the last call. +func (b *ClusterBootImageAutomaticApplyConfiguration) WithRHCOSVersion(value string) *ClusterBootImageAutomaticApplyConfiguration { + b.RHCOSVersion = &value + return b +} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimagemanual.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimagemanual.go new file mode 100644 index 000000000..0251eaef5 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/clusterbootimagemanual.go @@ -0,0 +1,45 @@ +// Code generated by applyconfiguration-gen. DO NOT EDIT. + +package v1 + +import ( + operatorv1 "github.com/openshift/api/operator/v1" +) + +// ClusterBootImageManualApplyConfiguration represents a declarative configuration of the ClusterBootImageManual type for use +// with apply. +type ClusterBootImageManualApplyConfiguration struct { + Mode *operatorv1.ClusterBootImageManualMode `json:"mode,omitempty"` + OCPVersion *string `json:"ocpVersion,omitempty"` + RHCOSVersion *string `json:"rhcosVersion,omitempty"` +} + +// ClusterBootImageManualApplyConfiguration constructs a declarative configuration of the ClusterBootImageManual type for use with +// apply. +func ClusterBootImageManual() *ClusterBootImageManualApplyConfiguration { + return &ClusterBootImageManualApplyConfiguration{} +} + +// WithMode sets the Mode field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Mode field is set to the value of the last call. +func (b *ClusterBootImageManualApplyConfiguration) WithMode(value operatorv1.ClusterBootImageManualMode) *ClusterBootImageManualApplyConfiguration { + b.Mode = &value + return b +} + +// WithOCPVersion sets the OCPVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the OCPVersion field is set to the value of the last call. +func (b *ClusterBootImageManualApplyConfiguration) WithOCPVersion(value string) *ClusterBootImageManualApplyConfiguration { + b.OCPVersion = &value + return b +} + +// WithRHCOSVersion sets the RHCOSVersion field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the RHCOSVersion field is set to the value of the last call. +func (b *ClusterBootImageManualApplyConfiguration) WithRHCOSVersion(value string) *ClusterBootImageManualApplyConfiguration { + b.RHCOSVersion = &value + return b +} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationspec.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationspec.go index 214b981b3..5c2e007db 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationspec.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationspec.go @@ -14,6 +14,7 @@ type MachineConfigurationSpecApplyConfiguration struct { ManagedBootImages *ManagedBootImagesApplyConfiguration `json:"managedBootImages,omitempty"` NodeDisruptionPolicy *NodeDisruptionPolicyConfigApplyConfiguration `json:"nodeDisruptionPolicy,omitempty"` IrreconcilableValidationOverrides *IrreconcilableValidationOverridesApplyConfiguration `json:"irreconcilableValidationOverrides,omitempty"` + BootImageSkewEnforcement *BootImageSkewEnforcementConfigApplyConfiguration `json:"bootImageSkewEnforcement,omitempty"` } // MachineConfigurationSpecApplyConfiguration constructs a declarative configuration of the MachineConfigurationSpec type for use with @@ -109,3 +110,11 @@ func (b *MachineConfigurationSpecApplyConfiguration) WithIrreconcilableValidatio b.IrreconcilableValidationOverrides = value return b } + +// WithBootImageSkewEnforcement sets the BootImageSkewEnforcement field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the BootImageSkewEnforcement field is set to the value of the last call. +func (b *MachineConfigurationSpecApplyConfiguration) WithBootImageSkewEnforcement(value *BootImageSkewEnforcementConfigApplyConfiguration) *MachineConfigurationSpecApplyConfiguration { + b.BootImageSkewEnforcement = value + return b +} diff --git a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationstatus.go b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationstatus.go index 073ca7c54..f94d6fa7f 100644 --- a/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationstatus.go +++ b/vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationstatus.go @@ -9,10 +9,11 @@ import ( // MachineConfigurationStatusApplyConfiguration represents a declarative configuration of the MachineConfigurationStatus type for use // with apply. type MachineConfigurationStatusApplyConfiguration struct { - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` - NodeDisruptionPolicyStatus *NodeDisruptionPolicyStatusApplyConfiguration `json:"nodeDisruptionPolicyStatus,omitempty"` - ManagedBootImagesStatus *ManagedBootImagesApplyConfiguration `json:"managedBootImagesStatus,omitempty"` + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` + NodeDisruptionPolicyStatus *NodeDisruptionPolicyStatusApplyConfiguration `json:"nodeDisruptionPolicyStatus,omitempty"` + ManagedBootImagesStatus *ManagedBootImagesApplyConfiguration `json:"managedBootImagesStatus,omitempty"` + BootImageSkewEnforcementStatus *BootImageSkewEnforcementStatusApplyConfiguration `json:"bootImageSkewEnforcementStatus,omitempty"` } // MachineConfigurationStatusApplyConfiguration constructs a declarative configuration of the MachineConfigurationStatus type for use with @@ -57,3 +58,11 @@ func (b *MachineConfigurationStatusApplyConfiguration) WithManagedBootImagesStat b.ManagedBootImagesStatus = value return b } + +// WithBootImageSkewEnforcementStatus sets the BootImageSkewEnforcementStatus field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the BootImageSkewEnforcementStatus field is set to the value of the last call. +func (b *MachineConfigurationStatusApplyConfiguration) WithBootImageSkewEnforcementStatus(value *BootImageSkewEnforcementStatusApplyConfiguration) *MachineConfigurationStatusApplyConfiguration { + b.BootImageSkewEnforcementStatus = value + return b +} diff --git a/vendor/modules.txt b/vendor/modules.txt index bec715dc2..dc72a885a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -377,7 +377,7 @@ github.com/openshift/api/config/v1alpha2 github.com/openshift/api/operator/v1 github.com/openshift/api/operator/v1alpha1 github.com/openshift/api/project/v1 -# github.com/openshift/client-go v0.0.0-20250915125341-81c9dc83a675 +# github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597 ## explicit; go 1.24.0 github.com/openshift/client-go/config/applyconfigurations/config/v1 github.com/openshift/client-go/config/applyconfigurations/internal