diff --git a/go.mod b/go.mod index a9ee08457c..6e1c18a74f 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( ) require ( - github.com/Azure/ARO-RP v0.0.0-20250602035759-0693f32d5ccc // indirect + github.com/Azure/ARO-RP v0.0.0-20260515041551-68371834636e // indirect github.com/antchfx/xpath v1.3.6 // indirect github.com/ccojocar/zxcvbn-go v1.0.4 // indirect github.com/coreos/fcct v0.5.0 // indirect @@ -158,7 +158,7 @@ require ( github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/fatih/color v1.19.0 // indirect github.com/fxamacker/cbor/v2 v2.9.1 // indirect - github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect + github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 // indirect github.com/go-openapi/jsonpointer v0.22.5 // indirect github.com/go-openapi/jsonreference v0.21.5 // indirect github.com/go-openapi/swag v0.25.5 // indirect diff --git a/go.sum b/go.sum index fdfda79f06..7c2b672fb9 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ cloud.google.com/go/auth v0.19.0 h1:DGYwtbcsGsT1ywuxsIoWi1u/vlks0moIblQHgSDgQkQ= cloud.google.com/go/auth v0.19.0/go.mod h1:2Aph7BT2KnaSFOM0JDPyiYgNh6PL9vGMiP8CUIXZ+IY= cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= -github.com/Azure/ARO-RP v0.0.0-20250602035759-0693f32d5ccc h1:j5zg78Ysu0iV+J53bhhQdattkARfT9PkedVkR9/mxjQ= -github.com/Azure/ARO-RP v0.0.0-20250602035759-0693f32d5ccc/go.mod h1:/1cmoOXPK2Gv+KQW1ocEw1y54ggd3JYFjoEVWAndPCg= +github.com/Azure/ARO-RP v0.0.0-20260515041551-68371834636e h1:McfD5I3ySIRSWCaIp75fXiR7PNcBA0ob7uulXcQNVvI= +github.com/Azure/ARO-RP v0.0.0-20260515041551-68371834636e/go.mod h1:5RjTn5x8F8t3ovcn7Fqyb0I76SCGuF7oCS93v9OtOaw= github.com/ComplianceAsCode/compliance-sdk v0.0.0-20250930163558-59886979dd19 h1:THSSJvmtj7k+c9QKoUeHap14FiOMOUsAJH/ENH5KMC0= github.com/ComplianceAsCode/compliance-sdk v0.0.0-20250930163558-59886979dd19/go.mod h1:ZL0fSwQU1JuTiX3RgQZ3F4aRY6usqHV6ShrhvgFtPXA= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= @@ -44,10 +44,10 @@ github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSE github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0= github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk= github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM= -github.com/containers/image/v5 v5.35.0 h1:T1OeyWp3GjObt47bchwD9cqiaAm/u4O4R9hIWdrdrP8= -github.com/containers/image/v5 v5.35.0/go.mod h1:8vTsgb+1gKcBL7cnjyNOInhJQfTUQjJoO2WWkKDoebM= -github.com/containers/storage v1.58.0 h1:Q7SyyCCjqgT3wYNgRNIL8o/wUS92heIj2/cc8Sewvcc= -github.com/containers/storage v1.58.0/go.mod h1:w7Jl6oG+OpeLGLzlLyOZPkmUso40kjpzgrHUk5tyBlo= +github.com/containers/image/v5 v5.36.2 h1:GcxYQyAHRF/pLqR4p4RpvKllnNL8mOBn0eZnqJbfTwk= +github.com/containers/image/v5 v5.36.2/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4= +github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHgIqDs= +github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0= github.com/coreos/fcct v0.5.0 h1:f/z+MCoR2vULes+MyoPEApQ6iluy/JbXoRi6dahPItQ= github.com/coreos/fcct v0.5.0/go.mod h1:cbE+j77YSQwFB2fozWVB3qsI2Pi3YiVEbDz/b6Yywdo= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= @@ -101,8 +101,8 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.9.1 h1:2rWm8B193Ll4VdjsJY28jxs70IdDsHRWgQYAI80+rMQ= github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= -github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= +github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 h1:Arcl6UOIS/kgO2nW3A65HN+7CMjSDP/gofXL4CZt1V4= +github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -200,8 +200,8 @@ github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmty github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -367,8 +367,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0= go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4= @@ -379,8 +379,8 @@ go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9 go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc= go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= -go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= -go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= +go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= +go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/groupversion_info.go b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/groupversion_info.go index 0f785779d9..522354ae78 100644 --- a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/groupversion_info.go +++ b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/groupversion_info.go @@ -8,6 +8,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" ) diff --git a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go index bade90d23d..b9013d8524 100644 --- a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1/zz_generated.deepcopy.go @@ -5,7 +5,7 @@ package v1alpha1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + kruntime "k8s.io/apimachinery/pkg/runtime" "github.com/openshift/api/operator/v1" ) @@ -45,7 +45,7 @@ func (in *Cluster) DeepCopy() *Cluster { } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Cluster) DeepCopyObject() runtime.Object { +func (in *Cluster) DeepCopyObject() kruntime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -77,7 +77,7 @@ func (in *ClusterList) DeepCopy() *ClusterList { } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *ClusterList) DeepCopyObject() runtime.Object { +func (in *ClusterList) DeepCopyObject() kruntime.Object { if c := in.DeepCopy(); c != nil { return c } diff --git a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/groupversion_info.go b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/groupversion_info.go index b62a3b1685..852abec0ba 100644 --- a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/groupversion_info.go +++ b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/groupversion_info.go @@ -8,6 +8,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" ) diff --git a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go index 59e9868251..16d70fd4d6 100644 --- a/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1/zz_generated.deepcopy.go @@ -5,7 +5,7 @@ package v1alpha1 import ( - runtime "k8s.io/apimachinery/pkg/runtime" + kruntime "k8s.io/apimachinery/pkg/runtime" "github.com/openshift/api/operator/v1" ) @@ -46,7 +46,7 @@ func (in *PreviewFeature) DeepCopy() *PreviewFeature { } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PreviewFeature) DeepCopyObject() runtime.Object { +func (in *PreviewFeature) DeepCopyObject() kruntime.Object { if c := in.DeepCopy(); c != nil { return c } @@ -78,7 +78,7 @@ func (in *PreviewFeatureList) DeepCopy() *PreviewFeatureList { } // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *PreviewFeatureList) DeepCopyObject() runtime.Object { +func (in *PreviewFeatureList) DeepCopyObject() kruntime.Object { if c := in.DeepCopy(); c != nil { return c } diff --git a/vendor/github.com/Azure/ARO-RP/pkg/operator/clientset/versioned/scheme/register.go b/vendor/github.com/Azure/ARO-RP/pkg/operator/clientset/versioned/scheme/register.go index 504e85c46f..72b5311ba0 100644 --- a/vendor/github.com/Azure/ARO-RP/pkg/operator/clientset/versioned/scheme/register.go +++ b/vendor/github.com/Azure/ARO-RP/pkg/operator/clientset/versioned/scheme/register.go @@ -16,13 +16,15 @@ import ( previewv1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1" ) -var Scheme = runtime.NewScheme() -var Codecs = serializer.NewCodecFactory(Scheme) -var ParameterCodec = runtime.NewParameterCodec(Scheme) -var localSchemeBuilder = runtime.SchemeBuilder{ - arov1alpha1.AddToScheme, - previewv1alpha1.AddToScheme, -} +var ( + Scheme = runtime.NewScheme() + Codecs = serializer.NewCodecFactory(Scheme) + ParameterCodec = runtime.NewParameterCodec(Scheme) + localSchemeBuilder = runtime.SchemeBuilder{ + arov1alpha1.AddToScheme, + previewv1alpha1.AddToScheme, + } +) // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: diff --git a/vendor/github.com/ghodss/yaml/.travis.yml b/vendor/github.com/ghodss/yaml/.travis.yml index 98ad417e22..0c69c68b4f 100644 --- a/vendor/github.com/ghodss/yaml/.travis.yml +++ b/vendor/github.com/ghodss/yaml/.travis.yml @@ -3,6 +3,11 @@ go: - "1.9" - "1.10" - "1.11" + - "1.12" + - "1.13" + - "1.14" + - "1.15" + - "1.16" script: - go test - go build diff --git a/vendor/github.com/ghodss/yaml/README.md b/vendor/github.com/ghodss/yaml/README.md index 0200f75b4d..ea916f6474 100644 --- a/vendor/github.com/ghodss/yaml/README.md +++ b/vendor/github.com/ghodss/yaml/README.md @@ -6,7 +6,7 @@ A wrapper around [go-yaml](https://github.com/go-yaml/yaml) designed to enable a better way of handling YAML when marshaling to and from structs. -In short, this library first converts YAML to JSON using go-yaml and then uses `json.Marshal` and `json.Unmarshal` to convert to or from the struct. This means that it effectively reuses the JSON struct tags as well as the custom JSON methods `MarshalJSON` and `UnmarshalJSON` unlike go-yaml. For a detailed overview of the rationale behind this method, [see this blog post](http://ghodss.com/2014/the-right-way-to-handle-yaml-in-golang/). +In short, this library first converts YAML to JSON using go-yaml and then uses `json.Marshal` and `json.Unmarshal` to convert to or from the struct. This means that it effectively reuses the JSON struct tags as well as the custom JSON methods `MarshalJSON` and `UnmarshalJSON` unlike go-yaml. For a detailed overview of the rationale behind this method, [see this blog post](https://web.archive.org/web/20150812020634/http://ghodss.com/2014/the-right-way-to-handle-yaml-in-golang/). ## Compatibility diff --git a/vendor/modules.txt b/vendor/modules.txt index 9376b5a739..257c690be1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,8 +25,8 @@ cloud.google.com/go/auth/internal/trustboundary # cloud.google.com/go/compute/metadata v0.9.0 ## explicit; go 1.24.0 cloud.google.com/go/compute/metadata -# github.com/Azure/ARO-RP v0.0.0-20250602035759-0693f32d5ccc -## explicit; go 1.22.9 +# github.com/Azure/ARO-RP v0.0.0-20260515041551-68371834636e +## explicit; go 1.25.3 github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1 github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1 github.com/Azure/ARO-RP/pkg/operator/clientset/versioned @@ -217,7 +217,7 @@ github.com/fsnotify/fsnotify/internal # github.com/fxamacker/cbor/v2 v2.9.1 ## explicit; go 1.20 github.com/fxamacker/cbor/v2 -# github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 +# github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344 ## explicit github.com/ghodss/yaml # github.com/go-logr/logr v1.4.3