From 1ae6b9b2a01a3f4df08be152000e0ad4731e0182 Mon Sep 17 00:00:00 2001 From: Joseph Callen Date: Mon, 16 Sep 2024 14:20:48 -0400 Subject: [PATCH] vendor bump --- go.mod | 6 +-- go.sum | 12 ++--- .../api/config/v1/types_cluster_version.go | 50 ++++++++++++++++++- ...1_clusterversions-CustomNoUpgrade.crd.yaml | 2 + ...erator_01_clusterversions-Default.crd.yaml | 2 + ...usterversions-DevPreviewNoUpgrade.crd.yaml | 2 + ...sterversions-TechPreviewNoUpgrade.crd.yaml | 2 + vendor/modules.txt | 12 ++--- 8 files changed, 72 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index ead31a79e..7c275aa8a 100644 --- a/go.mod +++ b/go.mod @@ -280,8 +280,8 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) -replace github.com/openshift/client-go => github.com/jcpowermac/client-go v0.0.0-20240911124348-2b8c555a89d6 +replace github.com/openshift/client-go => github.com/jcpowermac/client-go v0.0.0-20240916180655-683798bcb48f -replace github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20240911124719-344adc02cddb +replace github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20240916180856-466afdc3aa8b -replace github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20240910180256-297508356bf3 +replace github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20240916180434-3f02f0eb89e7 diff --git a/go.sum b/go.sum index 5cd49bd5c..b1e396b95 100644 --- a/go.sum +++ b/go.sum @@ -262,12 +262,12 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jcpowermac/api v0.0.0-20240910180256-297508356bf3 h1:2o7zUHgsrsYN+9WimddFcpNrKH7myh/cOuE9ZHGxwy4= -github.com/jcpowermac/api v0.0.0-20240910180256-297508356bf3/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= -github.com/jcpowermac/client-go v0.0.0-20240911124348-2b8c555a89d6 h1:j5DA2SoVROyCKRBmK8Ku8zpGBJG+qjVWN32hFboi8vI= -github.com/jcpowermac/client-go v0.0.0-20240911124348-2b8c555a89d6/go.mod h1:qnYY+XxGmt1/GlvSphZ7eWp1lpgLSXETjefQLLumMEM= -github.com/jcpowermac/library-go v0.0.0-20240911124719-344adc02cddb h1:BZ2gegGCybME6u8u259+KvydSxCyteFTqsWwGQjiuqE= -github.com/jcpowermac/library-go v0.0.0-20240911124719-344adc02cddb/go.mod h1:Eo02EPtU7qcajZbkMSp5y5SyqizSKMBZ3njK6DGTxn8= +github.com/jcpowermac/api v0.0.0-20240916180434-3f02f0eb89e7 h1:h0XpZHAIo5X/LaERci2yFKpw1rEAmbN/LqeOtrcPT0A= +github.com/jcpowermac/api v0.0.0-20240916180434-3f02f0eb89e7/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= +github.com/jcpowermac/client-go v0.0.0-20240916180655-683798bcb48f h1:af+YEsEKOUJF/TAW4uyq9k6T/fqzeJ+abJBpIRLoYJQ= +github.com/jcpowermac/client-go v0.0.0-20240916180655-683798bcb48f/go.mod h1:Akm68u0Z/uYU6ceFm32UsFW00kWEC3FJ8O6054fWtLc= +github.com/jcpowermac/library-go v0.0.0-20240916180856-466afdc3aa8b h1:5d/GL8gSw0qSOqMaq3oe38AiOrKJ531HS+zI+mDOXgs= +github.com/jcpowermac/library-go v0.0.0-20240916180856-466afdc3aa8b/go.mod h1:1laJRH76Dekrsl5xrUjBpaaalZBdOPOe7vhHUwBzCYA= github.com/jgautheron/goconst v1.7.1 h1:VpdAG7Ca7yvvJk5n8dMwQhfEZJh95kl/Hl9S1OI5Jkk= github.com/jgautheron/goconst v1.7.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go index 707af9d84..61386a72e 100644 --- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go +++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go @@ -428,7 +428,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{ } // ClusterVersionCapabilitySet defines sets of cluster version capabilities. -// +kubebuilder:validation:Enum=None;v4.11;v4.12;v4.13;v4.14;v4.15;v4.16;vCurrent +// +kubebuilder:validation:Enum=None;v4.11;v4.12;v4.13;v4.14;v4.15;v4.16;v4.17;v4.18;vCurrent type ClusterVersionCapabilitySet string const ( @@ -472,6 +472,18 @@ const ( // version of OpenShift is installed. ClusterVersionCapabilitySet4_16 ClusterVersionCapabilitySet = "v4.16" + // ClusterVersionCapabilitySet4_17 is the recommended set of + // optional capabilities to enable for the 4.17 version of + // OpenShift. This list will remain the same no matter which + // version of OpenShift is installed. + ClusterVersionCapabilitySet4_17 ClusterVersionCapabilitySet = "v4.17" + + // ClusterVersionCapabilitySet4_18 is the recommended set of + // optional capabilities to enable for the 4.18 version of + // OpenShift. This list will remain the same no matter which + // version of OpenShift is installed. + ClusterVersionCapabilitySet4_18 ClusterVersionCapabilitySet = "v4.18" + // ClusterVersionCapabilitySetCurrent is the recommended set // of optional capabilities to enable for the cluster's // current version of OpenShift. @@ -556,6 +568,42 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityIngress, ClusterVersionCapabilityCloudControllerManager, }, + ClusterVersionCapabilitySet4_17: { + ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, + ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityStorage, + ClusterVersionCapabilityOpenShiftSamples, + ClusterVersionCapabilityCSISnapshot, + ClusterVersionCapabilityNodeTuning, + ClusterVersionCapabilityMachineAPI, + ClusterVersionCapabilityBuild, + ClusterVersionCapabilityDeploymentConfig, + ClusterVersionCapabilityImageRegistry, + ClusterVersionCapabilityOperatorLifecycleManager, + ClusterVersionCapabilityCloudCredential, + ClusterVersionCapabilityIngress, + ClusterVersionCapabilityCloudControllerManager, + }, + ClusterVersionCapabilitySet4_18: { + ClusterVersionCapabilityBaremetal, + ClusterVersionCapabilityConsole, + ClusterVersionCapabilityInsights, + ClusterVersionCapabilityMarketplace, + ClusterVersionCapabilityStorage, + ClusterVersionCapabilityOpenShiftSamples, + ClusterVersionCapabilityCSISnapshot, + ClusterVersionCapabilityNodeTuning, + ClusterVersionCapabilityMachineAPI, + ClusterVersionCapabilityBuild, + ClusterVersionCapabilityDeploymentConfig, + ClusterVersionCapabilityImageRegistry, + ClusterVersionCapabilityOperatorLifecycleManager, + ClusterVersionCapabilityCloudCredential, + ClusterVersionCapabilityIngress, + ClusterVersionCapabilityCloudControllerManager, + }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityBaremetal, ClusterVersionCapabilityConsole, diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml index 3496c9b29..4e4a3ca3b 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml @@ -101,6 +101,8 @@ spec: - v4.14 - v4.15 - v4.16 + - v4.17 + - v4.18 - vCurrent type: string type: object diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml index 8d7008e38..bfc42ee23 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml @@ -101,6 +101,8 @@ spec: - v4.14 - v4.15 - v4.16 + - v4.17 + - v4.18 - vCurrent type: string type: object diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml index 2ca3c64a7..c6b84be67 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml @@ -101,6 +101,8 @@ spec: - v4.14 - v4.15 - v4.16 + - v4.17 + - v4.18 - vCurrent type: string type: object diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml index ea5703e19..21cd6c0d7 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml @@ -101,6 +101,8 @@ spec: - v4.14 - v4.15 - v4.16 + - v4.17 + - v4.18 - vCurrent type: string type: object diff --git a/vendor/modules.txt b/vendor/modules.txt index 75ca81d77..374999aa2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -719,7 +719,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/openshift/api v0.0.0-20240909041644-5852b58f4b10 => github.com/jcpowermac/api v0.0.0-20240910180256-297508356bf3 +# github.com/openshift/api v0.0.0-20240909041644-5852b58f4b10 => github.com/jcpowermac/api v0.0.0-20240916180434-3f02f0eb89e7 ## explicit; go 1.22.0 github.com/openshift/api github.com/openshift/api/annotations @@ -793,7 +793,7 @@ github.com/openshift/api/template github.com/openshift/api/template/v1 github.com/openshift/api/user github.com/openshift/api/user/v1 -# github.com/openshift/client-go v0.0.0-20240906181530-b2f7c4ab0984 => github.com/jcpowermac/client-go v0.0.0-20240911124348-2b8c555a89d6 +# github.com/openshift/client-go v0.0.0-20240906181530-b2f7c4ab0984 => github.com/jcpowermac/client-go v0.0.0-20240916180655-683798bcb48f ## explicit; go 1.22.0 github.com/openshift/client-go/config/applyconfigurations/config/v1 github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1 @@ -839,7 +839,7 @@ github.com/openshift/cluster-api-actuator-pkg/testutils/resourcebuilder/machine/ github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/failuredomain github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig github.com/openshift/cluster-control-plane-machine-set-operator/test/e2e/framework -# github.com/openshift/library-go v0.0.0-20240903143724-7c5c5d305ac1 => github.com/jcpowermac/library-go v0.0.0-20240911124719-344adc02cddb +# github.com/openshift/library-go v0.0.0-20240903143724-7c5c5d305ac1 => github.com/jcpowermac/library-go v0.0.0-20240916180856-466afdc3aa8b ## explicit; go 1.22.0 github.com/openshift/library-go/pkg/certs github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers @@ -2147,6 +2147,6 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 -# github.com/openshift/client-go => github.com/jcpowermac/client-go v0.0.0-20240911124348-2b8c555a89d6 -# github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20240911124719-344adc02cddb -# github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20240910180256-297508356bf3 +# github.com/openshift/client-go => github.com/jcpowermac/client-go v0.0.0-20240916180655-683798bcb48f +# github.com/openshift/library-go => github.com/jcpowermac/library-go v0.0.0-20240916180856-466afdc3aa8b +# github.com/openshift/api => github.com/jcpowermac/api v0.0.0-20240916180434-3f02f0eb89e7