From 703f172a2838c2ec6303faaf81793ffb4ad8308c Mon Sep 17 00:00:00 2001 From: redhat-renovate-bot Date: Tue, 13 Aug 2024 09:18:27 +0000 Subject: [PATCH] chore(deps): update all dependencies Signed-off-by: redhat-renovate-bot --- api/go.mod | 4 ++-- api/go.sum | 4 ++++ .../github.com/openshift/api/config/v1/types.go | 6 +++++- .../api/config/v1/types_cluster_version.go | 1 - .../openshift/api/config/v1/types_feature.go | 1 + .../api/config/v1/types_infrastructure.go | 2 +- .../api/config/v1/types_tlssecurityprofile.go | 1 + .../v1/zz_generated.swagger_doc_generated.go | 2 +- api/vendor/modules.txt | 6 +++--- ci-builder/Dockerfile | 2 +- go.mod | 14 +++++++------- 11 files changed, 26 insertions(+), 17 deletions(-) diff --git a/api/go.mod b/api/go.mod index 1fc5454a5..d2b7c84c2 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,11 +3,11 @@ module kubevirt.io/ssp-operator/api go 1.22.4 require ( - github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17 // release-4.16 + github.com/openshift/api v0.0.0-20240812094746-86145edb40cf // release-4.16 k8s.io/apimachinery v0.30.3 kubevirt.io/containerized-data-importer-api v1.59.0 kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 - sigs.k8s.io/controller-runtime v0.18.4 + sigs.k8s.io/controller-runtime v0.18.5 ) require ( diff --git a/api/go.sum b/api/go.sum index 98885fcc9..3ec1a7e9f 100644 --- a/api/go.sum +++ b/api/go.sum @@ -128,6 +128,8 @@ github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17 h1:Hl43oJR6bKPkW8xQty+N+/Ot8ioEyLwNU4CNvxik7iE= github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4= +github.com/openshift/api v0.0.0-20240812094746-86145edb40cf h1:MB0TCPkvxj80Ucj7w6xArL4StOrQBMN7AvGYtsP5t2M= +github.com/openshift/api v0.0.0-20240812094746-86145edb40cf/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4= github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -316,6 +318,8 @@ kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 h1:fZYvD3/Vnitfkx6IJxjL kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc= sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= +sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= diff --git a/api/vendor/github.com/openshift/api/config/v1/types.go b/api/vendor/github.com/openshift/api/config/v1/types.go index 6fb1b9adc..d4d09e7fe 100644 --- a/api/vendor/github.com/openshift/api/config/v1/types.go +++ b/api/vendor/github.com/openshift/api/config/v1/types.go @@ -401,7 +401,7 @@ const ( // IBMCloudServiceName contains a value specifying the name of an IBM Cloud Service, // which are used by MAPI, CIRO, CIO, Installer, etc. -// +kubebuilder:validation:Enum=CIS;COS;DNSServices;GlobalSearch;GlobalTagging;HyperProtect;IAM;KeyProtect;ResourceController;ResourceManager;VPC +// +kubebuilder:validation:Enum=CIS;COS;COSConfig;DNSServices;GlobalCatalog;GlobalSearch;GlobalTagging;HyperProtect;IAM;KeyProtect;ResourceController;ResourceManager;VPC type IBMCloudServiceName string const ( @@ -409,8 +409,12 @@ const ( IBMCloudServiceCIS IBMCloudServiceName = "CIS" // IBMCloudServiceCOS is the name for IBM Cloud COS. IBMCloudServiceCOS IBMCloudServiceName = "COS" + // IBMCloudServiceCOSConfig is the name for IBM Cloud COS Config service. + IBMCloudServiceCOSConfig IBMCloudServiceName = "COSConfig" // IBMCloudServiceDNSServices is the name for IBM Cloud DNS Services. IBMCloudServiceDNSServices IBMCloudServiceName = "DNSServices" + // IBMCloudServiceGlobalCatalog is the name for IBM Cloud Global Catalog service. + IBMCloudServiceGlobalCatalog IBMCloudServiceName = "GlobalCatalog" // IBMCloudServiceGlobalSearch is the name for IBM Cloud Global Search. IBMCloudServiceGlobalSearch IBMCloudServiceName = "GlobalSearch" // IBMCloudServiceGlobalTagging is the name for IBM Cloud Global Tagging. diff --git a/api/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/api/vendor/github.com/openshift/api/config/v1/types_cluster_version.go index 2b8c30213..707af9d84 100644 --- a/api/vendor/github.com/openshift/api/config/v1/types_cluster_version.go +++ b/api/vendor/github.com/openshift/api/config/v1/types_cluster_version.go @@ -18,7 +18,6 @@ import ( // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:path=clusterversions,scope=Cluster -// +kubebuilder:validation:XValidation:rule="has(self.spec.capabilities) && has(self.spec.capabilities.additionalEnabledCapabilities) && self.spec.capabilities.baselineCapabilitySet == 'None' && 'baremetal' in self.spec.capabilities.additionalEnabledCapabilities ? 'MachineAPI' in self.spec.capabilities.additionalEnabledCapabilities || (has(self.status) && has(self.status.capabilities) && has(self.status.capabilities.enabledCapabilities) && 'MachineAPI' in self.status.capabilities.enabledCapabilities) : true",message="the `baremetal` capability requires the `MachineAPI` capability, which is neither explicitly or implicitly enabled in this cluster, please enable the `MachineAPI` capability" // +kubebuilder:validation:XValidation:rule="has(self.spec.capabilities) && has(self.spec.capabilities.additionalEnabledCapabilities) && self.spec.capabilities.baselineCapabilitySet == 'None' && 'marketplace' in self.spec.capabilities.additionalEnabledCapabilities ? 'OperatorLifecycleManager' in self.spec.capabilities.additionalEnabledCapabilities || (has(self.status) && has(self.status.capabilities) && has(self.status.capabilities.enabledCapabilities) && 'OperatorLifecycleManager' in self.status.capabilities.enabledCapabilities) : true",message="the `marketplace` capability requires the `OperatorLifecycleManager` capability, which is neither explicitly or implicitly enabled in this cluster, please enable the `OperatorLifecycleManager` capability" // +kubebuilder:printcolumn:name=Version,JSONPath=.status.history[?(@.state=="Completed")].version,type=string // +kubebuilder:printcolumn:name=Available,JSONPath=.status.conditions[?(@.type=="Available")].status,type=string diff --git a/api/vendor/github.com/openshift/api/config/v1/types_feature.go b/api/vendor/github.com/openshift/api/config/v1/types_feature.go index 99d99f5b5..88d94ac52 100644 --- a/api/vendor/github.com/openshift/api/config/v1/types_feature.go +++ b/api/vendor/github.com/openshift/api/config/v1/types_feature.go @@ -68,6 +68,7 @@ type FeatureGateSelection struct { // Turning on or off features may cause irreversible changes in your cluster which cannot be undone. // +unionDiscriminator // +optional + // +kubebuilder:validation:Enum=CustomNoUpgrade;DevPreviewNoUpgrade;TechPreviewNoUpgrade;"" // +kubebuilder:validation:XValidation:rule="oldSelf == 'CustomNoUpgrade' ? self == 'CustomNoUpgrade' : true",message="CustomNoUpgrade may not be changed" // +kubebuilder:validation:XValidation:rule="oldSelf == 'TechPreviewNoUpgrade' ? self == 'TechPreviewNoUpgrade' : true",message="TechPreviewNoUpgrade may not be changed" // +kubebuilder:validation:XValidation:rule="oldSelf == 'DevPreviewNoUpgrade' ? self == 'DevPreviewNoUpgrade' : true",message="DevPreviewNoUpgrade may not be changed" diff --git a/api/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/api/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index 8e50008ea..e5ff5fc61 100644 --- a/api/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/api/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -1473,7 +1473,7 @@ type VSpherePlatformStatus struct { // override existing defaults of IBM Cloud Services. type IBMCloudServiceEndpoint struct { // name is the name of the IBM Cloud service. - // Possible values are: CIS, COS, DNSServices, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. + // Possible values are: CIS, COS, COSConfig, DNSServices, GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. // For example, the IBM Cloud Private IAM service could be configured with the // service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com` // Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured diff --git a/api/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go b/api/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go index c5dea1a03..b18ef647c 100644 --- a/api/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go +++ b/api/vendor/github.com/openshift/api/config/v1/types_tlssecurityprofile.go @@ -211,6 +211,7 @@ type TLSProfileSpec struct { // ciphers: // - DES-CBC3-SHA // + // +listType=atomic Ciphers []string `json:"ciphers"` // minTLSVersion is used to specify the minimal version of the TLS protocol // that is negotiated during the TLS handshake. For example, to use TLS diff --git a/api/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/api/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index fcb4fb9a4..e5e9bdb89 100644 --- a/api/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/api/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -1439,7 +1439,7 @@ func (IBMCloudPlatformStatus) SwaggerDoc() map[string]string { var map_IBMCloudServiceEndpoint = map[string]string{ "": "IBMCloudServiceEndpoint stores the configuration of a custom url to override existing defaults of IBM Cloud Services.", - "name": "name is the name of the IBM Cloud service. Possible values are: CIS, COS, DNSServices, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. For example, the IBM Cloud Private IAM service could be configured with the service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com` Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured with the service `name` of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`", + "name": "name is the name of the IBM Cloud service. Possible values are: CIS, COS, COSConfig, DNSServices, GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC. For example, the IBM Cloud Private IAM service could be configured with the service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com` Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured with the service `name` of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`", "url": "url is fully qualified URI with scheme https, that overrides the default generated endpoint for a client. This must be provided and cannot be empty.", } diff --git a/api/vendor/modules.txt b/api/vendor/modules.txt index 494c838b5..5d5c4f7c2 100644 --- a/api/vendor/modules.txt +++ b/api/vendor/modules.txt @@ -18,8 +18,8 @@ github.com/modern-go/concurrent # github.com/modern-go/reflect2 v1.0.2 ## explicit; go 1.12 github.com/modern-go/reflect2 -# github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17 -## explicit; go 1.21 +# github.com/openshift/api v0.0.0-20240812094746-86145edb40cf +## explicit; go 1.22.0 github.com/openshift/api/config/v1 # github.com/openshift/custom-resource-status v1.1.2 ## explicit; go 1.12 @@ -92,7 +92,7 @@ kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1 # kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 ## explicit; go 1.17 kubevirt.io/controller-lifecycle-operator-sdk/api -# sigs.k8s.io/controller-runtime v0.18.4 +# sigs.k8s.io/controller-runtime v0.18.5 ## explicit; go 1.22.0 sigs.k8s.io/controller-runtime/pkg/scheme # sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd diff --git a/ci-builder/Dockerfile b/ci-builder/Dockerfile index d4895b8cb..c73bceb6b 100644 --- a/ci-builder/Dockerfile +++ b/ci-builder/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile is used in openshift CI -FROM quay.io/fedora/fedora:40 +FROM quay.io/fedora/fedora:41 RUN curl -L https://go.dev/dl/go1.22.4.linux-amd64.tar.gz | tar -C /usr/local -xzf - ENV PATH=$PATH:/usr/local/go/bin diff --git a/go.mod b/go.mod index 047e7ae08..b7cfbc55a 100644 --- a/go.mod +++ b/go.mod @@ -6,13 +6,13 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/fsnotify/fsnotify v1.7.0 github.com/go-logr/logr v1.4.2 - github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230706095033-373a95665d5a + github.com/kubevirt/monitoring/pkg/metrics/parser 7667760c3f72 github.com/machadovilaca/operator-observability v0.0.21 - github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/ginkgo/v2 v2.20.0 github.com/onsi/gomega v1.34.1 - github.com/openshift/api v0.0.0-20240702171116-4b89b3a92a17 // release-4.16 + github.com/openshift/api 86145edb40cf // release-4.16 github.com/openshift/custom-resource-status v1.1.2 - github.com/openshift/library-go v0.0.0-20240711192904-190fec8c3f09 // release-4.16 + github.com/openshift/library-go c18b2bea42de // release-4.16 github.com/operator-framework/api v0.26.0 github.com/operator-framework/operator-lib v0.14.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 @@ -22,18 +22,18 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/tektoncd/pipeline v0.62.1 - gomodules.xyz/jsonpatch/v2 v2.4.0 + gomodules.xyz/jsonpatch/v2/v3 v3.0.1 k8s.io/api v0.30.3 k8s.io/apiextensions-apiserver v0.30.3 k8s.io/apimachinery v0.30.3 k8s.io/client-go v0.30.3 k8s.io/kube-aggregator v0.30.3 - k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 + k8s.io/utils 18e509b52bc8 kubevirt.io/api v1.3.0 kubevirt.io/containerized-data-importer-api v1.59.0 kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 kubevirt.io/qe-tools v0.1.8 - kubevirt.io/ssp-operator/api v0.0.0 + kubevirt.io/ssp-operator/api v0.20.0 sigs.k8s.io/controller-runtime v0.18.5 sigs.k8s.io/kustomize/api v0.17.3 sigs.k8s.io/kustomize/kyaml v0.17.2