From 97c41b00e2def714aaf1aeb4501af73174c46b54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Oct 2026 07:35:31 +0000 Subject: [PATCH 1/5] chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) in `/` from 0.74.0 to 0.94.1. Updates `github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring` from 0.74.0 to 0.94.1 - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus-operator/prometheus-operator/compare/v0.74.0...v0.94.1) Updates `github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring` from 0.74.0 to 0.94.1 - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus-operator/prometheus-operator/compare/v0.74.0...v0.94.1) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-version: 0.94.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod-combined/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-version: 0.94.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gomod-combined/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring ... Signed-off-by: dependabot[bot] --- argocd-operator/go.mod | 22 +++++++++++----------- argocd-operator/go.sum | 20 ++++++++++---------- go.mod | 22 +++++++++++----------- go.sum | 20 ++++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/argocd-operator/go.mod b/argocd-operator/go.mod index 04f02c3b32b..6276a079e3a 100644 --- a/argocd-operator/go.mod +++ b/argocd-operator/go.mod @@ -14,20 +14,20 @@ require ( github.com/onsi/gomega v1.44.0 github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2 github.com/operator-framework/api v0.17.5 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 github.com/prometheus/client_golang v1.25.0 github.com/sethvargo/go-password v0.4.0 github.com/stretchr/testify v1.12.1 go.uber.org/zap v1.28.0 // indirect golang.org/x/mod v0.42.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.36.2 - k8s.io/apiextensions-apiserver v0.36.2 - k8s.io/apimachinery v0.36.2 - k8s.io/client-go v0.36.2 + k8s.io/api v0.37.0 + k8s.io/apiextensions-apiserver v0.37.0 + k8s.io/apimachinery v0.37.0 + k8s.io/client-go v0.37.0 k8s.io/kube-aggregator v0.36.1 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 - sigs.k8s.io/controller-runtime v0.24.1 + sigs.k8s.io/controller-runtime v0.25.0 sigs.k8s.io/yaml v1.6.0 ) @@ -69,7 +69,7 @@ require ( go.uber.org/atomic v1.11.0 // indirect google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect - k8s.io/streaming v0.36.2 // indirect + k8s.io/streaming v0.37.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect ) @@ -112,7 +112,7 @@ require ( github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect github.com/fatih/camelcase v1.0.0 // indirect github.com/fsnotify/fsnotify v1.10.1 // indirect - github.com/fxamacker/cbor/v2 v2.9.2 // indirect + github.com/fxamacker/cbor/v2 v2.9.3 // indirect github.com/go-errors/errors v1.5.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.9.2 // indirect @@ -193,13 +193,13 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - k8s.io/apiserver v0.36.2 // indirect + k8s.io/apiserver v0.37.0 // indirect k8s.io/cli-runtime v0.36.1 // indirect - k8s.io/component-base v0.36.2 // indirect + k8s.io/component-base v0.37.0 // indirect k8s.io/component-helpers v0.36.1 // indirect k8s.io/controller-manager v0.36.1 // indirect k8s.io/klog/v2 v2.140.0 // indirect - k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 // indirect + k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 // indirect k8s.io/kubectl v0.36.1 // indirect k8s.io/kubernetes v1.36.1 // indirect oras.land/oras-go/v2 v2.6.2 // indirect diff --git a/argocd-operator/go.sum b/argocd-operator/go.sum index 5c6380dfae5..0efd18ebd51 100644 --- a/argocd-operator/go.sum +++ b/argocd-operator/go.sum @@ -130,8 +130,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= -github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= -github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/fxamacker/cbor/v2 v2.9.3 h1:oQBnFATpNdY8gJHTndDDv5Xl4QqNaz51G5LLEPhng3Q= +github.com/fxamacker/cbor/v2 v2.9.3/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs= github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo= @@ -383,8 +383,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 h1:AHzMWDxNiAVscJL6+4wkvFRTpMnJqiaZFEKA/osaBXE= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0/go.mod h1:wAR5JopumPtAZnu0Cjv2PSqV4p4QB09LMhc6fZZTXuA= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 h1:TWZqERWd1r20mHm6rCahhWuCaDq4PQFHgzQifOpFsc0= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1/go.mod h1:n4uH73YCwqQomLLIKEthHFwh4F9PneNaP6eaIIscpVg= github.com/prometheus/client_golang v1.25.0 h1:cDtW1TcFsMi1RJc8khwCKB4VhzwV04aKqbYtNOXuiK0= github.com/prometheus/client_golang v1.25.0/go.mod h1:j2X/4/kaQHLPnmyEU8zjmkndo1T317VpCIQEml8LTKk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -680,22 +680,22 @@ k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= k8s.io/kube-aggregator v0.36.1 h1:IzNeRsJcTtgsiCyTgCR1pSwWCrXC1QZQWMTcBw18cFQ= k8s.io/kube-aggregator v0.36.1/go.mod h1:ROrIm5irUhVUJsKVCgBAAcXpK5IiqpdCn0Ka7LYMGs4= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 h1:CVjOUCTXINUThEmDs25FNSna0+vnGSoTleN+wiJu6hE= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms= +k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 h1:z5+pcu1jTyKK5mNTe2/+x+U6Uuv9jRVOJQLaBJJMpeI= +k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= k8s.io/kubectl v0.36.1 h1:96HqS9twIdHM0MlJLTwbo14b9kUKPkOzZ4tlRDLv4qI= k8s.io/kubectl v0.36.1/go.mod h1:/DGPAIewKsFWF9VFgGvkPhao2Ev4SNuE3BioZo8yPbk= k8s.io/kubelet v0.36.1 h1:FcHiG9wv92xerRPNxztuhYWqwS4IilOQNPxTPQewYgo= k8s.io/kubelet v0.36.1/go.mod h1:e6IeoCwqc2TbneCKu6P8HjmWLi7U6SOh3Pocs32iGFM= k8s.io/kubernetes v1.36.1 h1:Mt7NKigaZ2KmOmCLhX81lGlH9JU5wjXnYhXnxAun9XA= k8s.io/kubernetes v1.36.1/go.mod h1:MLdeJ3qw2CWH9BFml5GvptxQVQckz54fJOZ/WuixpFE= -k8s.io/streaming v0.36.2 h1:NSKthPPg9UFSKsRauVJUVGH2Dvn8fhKmY4qrMkw/p98= -k8s.io/streaming v0.36.2/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s= +k8s.io/streaming v0.37.0 h1:iPBUZLZiKt5bV+lxJurASMOV07VuBhNpiwJt2//AWrM= +k8s.io/streaming v0.37.0/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= -sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= -sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= +sigs.k8s.io/controller-runtime v0.25.0 h1:44KgRUPew331KSJpNu8zJow3iTR5W0p/SfrHdw3lV40= +sigs.k8s.io/controller-runtime v0.25.0/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= sigs.k8s.io/gateway-api v1.5.0 h1:duoo14Ky/fJXpjpmyMISE2RTBGnfCg8zICfTYLTnBJA= sigs.k8s.io/gateway-api v1.5.0/go.mod h1:GvCETiaMAlLym5CovLxGjS0NysqFk3+Yuq3/rh6QL2o= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= diff --git a/go.mod b/go.mod index 59734bebe0b..0872d9c071e 100644 --- a/go.mod +++ b/go.mod @@ -24,20 +24,20 @@ require ( github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2 github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e github.com/operator-framework/api v0.17.5 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 github.com/stretchr/testify v1.12.1 go.uber.org/zap v1.28.0 golang.org/x/crypto v0.58.0 golang.org/x/mod v0.42.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible - k8s.io/api v0.36.4 - k8s.io/apiextensions-apiserver v0.36.4 - k8s.io/apimachinery v0.36.4 - k8s.io/client-go v0.36.4 + k8s.io/api v0.37.0 + k8s.io/apiextensions-apiserver v0.37.0 + k8s.io/apimachinery v0.37.0 + k8s.io/client-go v0.37.0 k8s.io/kube-aggregator v0.36.2 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 - sigs.k8s.io/controller-runtime v0.24.1 + sigs.k8s.io/controller-runtime v0.25.0 sigs.k8s.io/yaml v1.6.0 ) @@ -81,7 +81,7 @@ require ( github.com/fatih/camelcase v1.0.0 // indirect github.com/felixge/httpsnoop v1.1.0 // indirect github.com/fsnotify/fsnotify v1.10.1 // indirect - github.com/fxamacker/cbor/v2 v2.9.2 // indirect + github.com/fxamacker/cbor/v2 v2.9.3 // indirect github.com/go-errors/errors v1.5.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.9.2 // indirect @@ -201,16 +201,16 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiserver v0.36.4 // indirect + k8s.io/apiserver v0.37.0 // indirect k8s.io/cli-runtime v0.36.4 // indirect - k8s.io/component-base v0.36.4 // indirect + k8s.io/component-base v0.37.0 // indirect k8s.io/component-helpers v0.36.4 // indirect k8s.io/controller-manager v0.36.1 // indirect k8s.io/klog/v2 v2.140.0 // indirect - k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 // indirect + k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 // indirect k8s.io/kubectl v0.36.1 // indirect k8s.io/kubernetes v1.36.1 // indirect - k8s.io/streaming v0.36.4 // indirect + k8s.io/streaming v0.37.0 // indirect oras.land/oras-go/v2 v2.6.2 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect sigs.k8s.io/gateway-api v1.6.0 // indirect diff --git a/go.sum b/go.sum index f22d0edd6cd..9302252b896 100644 --- a/go.sum +++ b/go.sum @@ -136,8 +136,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= -github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= -github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/fxamacker/cbor/v2 v2.9.3 h1:oQBnFATpNdY8gJHTndDDv5Xl4QqNaz51G5LLEPhng3Q= +github.com/fxamacker/cbor/v2 v2.9.3/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs= github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo= @@ -397,8 +397,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 h1:AHzMWDxNiAVscJL6+4wkvFRTpMnJqiaZFEKA/osaBXE= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0/go.mod h1:wAR5JopumPtAZnu0Cjv2PSqV4p4QB09LMhc6fZZTXuA= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 h1:TWZqERWd1r20mHm6rCahhWuCaDq4PQFHgzQifOpFsc0= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1/go.mod h1:n4uH73YCwqQomLLIKEthHFwh4F9PneNaP6eaIIscpVg= github.com/prometheus/client_golang v1.25.0 h1:cDtW1TcFsMi1RJc8khwCKB4VhzwV04aKqbYtNOXuiK0= github.com/prometheus/client_golang v1.25.0/go.mod h1:j2X/4/kaQHLPnmyEU8zjmkndo1T317VpCIQEml8LTKk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -706,24 +706,24 @@ k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= k8s.io/kube-aggregator v0.36.4 h1:B593UGiOA2ivyuWOSvgWly5lXkTPLcYpeZwkq4Y+ieA= k8s.io/kube-aggregator v0.36.4/go.mod h1:05q7hjy8iKStLM1e+BOQ8mMVPnIfAqfpkhZDPGxS0xY= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0 h1:CVjOUCTXINUThEmDs25FNSna0+vnGSoTleN+wiJu6hE= -k8s.io/kube-openapi v0.0.0-20260706235625-cdb1db5517a0/go.mod h1:rcZ+P5cEvHQB+m154WBOatIGBgOEPjzmLkXjkHfg3ms= +k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 h1:z5+pcu1jTyKK5mNTe2/+x+U6Uuv9jRVOJQLaBJJMpeI= +k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= k8s.io/kubectl v0.36.4 h1:xZd9g1bFBd7hpb1oKjK8lT9jRL18dtgr4DAPQG1Oksk= k8s.io/kubectl v0.36.4/go.mod h1:STWlr78cdEa1hHpr55wpcboaqchvfDueKRNDa1zOd1w= k8s.io/kubelet v0.36.4 h1:mlmXnkrq3H02r/r0H/8M2jdPY7f4I4u4cA0tHnsPzY0= k8s.io/kubelet v0.36.4/go.mod h1:jcOhk4E8cdUBn7WswW67WH9waQTe37G057ttnYdcaKY= k8s.io/kubernetes v1.36.1 h1:Mt7NKigaZ2KmOmCLhX81lGlH9JU5wjXnYhXnxAun9XA= k8s.io/kubernetes v1.36.1/go.mod h1:MLdeJ3qw2CWH9BFml5GvptxQVQckz54fJOZ/WuixpFE= -k8s.io/streaming v0.36.4 h1:RS5YlhrdBN2pKGVjgygGntdu6SNdsduyjGWGe3cX0vo= -k8s.io/streaming v0.36.4/go.mod h1:tJ6S2bZa2HxIBauguBbCWSCYyd93Grfz1+z3tcOvlDE= +k8s.io/streaming v0.37.0 h1:iPBUZLZiKt5bV+lxJurASMOV07VuBhNpiwJt2//AWrM= +k8s.io/streaming v0.37.0/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 h1:/YpDJ4vReG7ZmzSpBGxduXgywWkJU9zHubgJG03MT+Y= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0/go.mod h1:tJo1aepTXyR+8Xs3sUsGBDk4Ub2AM5dPAPKJx0mpm5c= -sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= -sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= +sigs.k8s.io/controller-runtime v0.25.0 h1:44KgRUPew331KSJpNu8zJow3iTR5W0p/SfrHdw3lV40= +sigs.k8s.io/controller-runtime v0.25.0/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= sigs.k8s.io/gateway-api v1.6.0 h1:735YBRj5NXFrOGX0GoSjwzUIzbz8kiEOfADsqHFmHgE= sigs.k8s.io/gateway-api v1.6.0/go.mod h1:FVfx3t389ybeXOqvDghLbdvJdSCfI/PReqCUI3lu3mY= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= From b009f579340440d36f9913fda1fe9950576562c1 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Mon, 26 Oct 2026 08:38:25 -0400 Subject: [PATCH 2/5] chore: update to latest prometheus-operator Signed-off-by: Jonathan West --- .../controllers/argocd/prometheus.go | 2 +- argocd-operator/go.mod | 2 +- argocd-operator/go.sum | 4 +-- go.mod | 2 +- go.sum | 4 +-- .../1-104_validate_prometheus_alert_test.go | 35 +++++++++++-------- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/argocd-operator/controllers/argocd/prometheus.go b/argocd-operator/controllers/argocd/prometheus.go index e7a63501c90..9f1df05f2a2 100644 --- a/argocd-operator/controllers/argocd/prometheus.go +++ b/argocd-operator/controllers/argocd/prometheus.go @@ -118,7 +118,7 @@ func getMetricsEndpoint(metrics *argoproj.ArgoCDMetricsSpec) monitoringv1.Endpoi func (r *ReconcileArgoCD) updateServiceMonitorEndpointIfNeeded(sm *monitoringv1.ServiceMonitor, desired monitoringv1.Endpoint) error { if len(sm.Spec.Endpoints) == 1 && sm.Spec.Endpoints[0].Port == desired.Port && - sm.Spec.Endpoints[0].Scheme == desired.Scheme && + ptr.Equal(sm.Spec.Endpoints[0].Scheme, desired.Scheme) && sm.Spec.Endpoints[0].Interval == desired.Interval && sm.Spec.Endpoints[0].ScrapeTimeout == desired.ScrapeTimeout { return nil diff --git a/argocd-operator/go.mod b/argocd-operator/go.mod index 6276a079e3a..becd5e3015a 100644 --- a/argocd-operator/go.mod +++ b/argocd-operator/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.44.0 github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2 github.com/operator-framework/api v0.17.5 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1 github.com/prometheus/client_golang v1.25.0 github.com/sethvargo/go-password v0.4.0 github.com/stretchr/testify v1.12.1 diff --git a/argocd-operator/go.sum b/argocd-operator/go.sum index 0efd18ebd51..01b4a5e76e1 100644 --- a/argocd-operator/go.sum +++ b/argocd-operator/go.sum @@ -383,8 +383,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 h1:TWZqERWd1r20mHm6rCahhWuCaDq4PQFHgzQifOpFsc0= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1/go.mod h1:n4uH73YCwqQomLLIKEthHFwh4F9PneNaP6eaIIscpVg= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1 h1:MR19V0wQ1ymlsURnlODjcnsVrClhclUgZMnbn6A+aRs= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1/go.mod h1:eGo3VN8Kq5Fd0M7Cdx0oqbIxo753t99ojUZFVQkO1UM= github.com/prometheus/client_golang v1.25.0 h1:cDtW1TcFsMi1RJc8khwCKB4VhzwV04aKqbYtNOXuiK0= github.com/prometheus/client_golang v1.25.0/go.mod h1:j2X/4/kaQHLPnmyEU8zjmkndo1T317VpCIQEml8LTKk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/go.mod b/go.mod index 0872d9c071e..473c690e65e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/openshift/api v0.0.0-20260619095050-5346161d1bf2 github.com/openshift/controller-runtime-common v0.0.0-20260428152732-64ee174f5e2e github.com/operator-framework/api v0.17.5 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1 github.com/stretchr/testify v1.12.1 go.uber.org/zap v1.28.0 golang.org/x/crypto v0.58.0 diff --git a/go.sum b/go.sum index 9302252b896..96d6adc6685 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1 h1:TWZqERWd1r20mHm6rCahhWuCaDq4PQFHgzQifOpFsc0= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.94.1/go.mod h1:n4uH73YCwqQomLLIKEthHFwh4F9PneNaP6eaIIscpVg= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1 h1:MR19V0wQ1ymlsURnlODjcnsVrClhclUgZMnbn6A+aRs= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.92.1/go.mod h1:eGo3VN8Kq5Fd0M7Cdx0oqbIxo753t99ojUZFVQkO1UM= github.com/prometheus/client_golang v1.25.0 h1:cDtW1TcFsMi1RJc8khwCKB4VhzwV04aKqbYtNOXuiK0= github.com/prometheus/client_golang v1.25.0/go.mod h1:j2X/4/kaQHLPnmyEU8zjmkndo1T317VpCIQEml8LTKk= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go b/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go index 0677865c47e..e504ab14cf0 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go @@ -37,28 +37,35 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } Eventually(sm).Should(k8sFixture.ExistByName()) serverName := "openshift-gitops-operator-metrics-service.openshift-gitops-operator.svc" + scheme := monitoringv1.Scheme("https") Expect(sm.Spec.Endpoints).To(Equal([]monitoringv1.Endpoint{{ - BearerTokenSecret: &corev1.SecretKeySelector{ - LocalObjectReference: corev1.LocalObjectReference{ - Name: "openshift-gitops-operator-metrics-monitor-bearer-token", - }, - Key: "token", - }, Interval: monitoringv1.Duration("30s"), Path: "/metrics", Port: "metrics", - Scheme: "https", - TLSConfig: &monitoringv1.TLSConfig{ - SafeTLSConfig: monitoringv1.SafeTLSConfig{ - CA: monitoringv1.SecretOrConfigMap{ - ConfigMap: &corev1.ConfigMapKeySelector{ + Scheme: &scheme, + HTTPConfigWithProxyAndTLSFiles: monitoringv1.HTTPConfigWithProxyAndTLSFiles{ + HTTPConfigWithTLSFiles: monitoringv1.HTTPConfigWithTLSFiles{ + HTTPConfigWithoutTLS: monitoringv1.HTTPConfigWithoutTLS{ + BearerTokenSecret: &corev1.SecretKeySelector{ LocalObjectReference: corev1.LocalObjectReference{ - Name: "openshift-gitops-operator-metrics-monitor-ca-bundle", + Name: "openshift-gitops-operator-metrics-monitor-bearer-token", + }, + Key: "token", + }, + }, + TLSConfig: &monitoringv1.TLSConfig{ + SafeTLSConfig: monitoringv1.SafeTLSConfig{ + CA: monitoringv1.SecretOrConfigMap{ + ConfigMap: &corev1.ConfigMapKeySelector{ + LocalObjectReference: corev1.LocalObjectReference{ + Name: "openshift-gitops-operator-metrics-monitor-ca-bundle", + }, + Key: "service-ca.crt", + }, }, - Key: "service-ca.crt", + ServerName: &serverName, }, }, - ServerName: &serverName, }, }, }})) From 2604a456a6af6e8c876b031fb926cbb9d07b3419 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Mon, 26 Oct 2026 08:39:36 -0400 Subject: [PATCH 3/5] chore: run go-fix on resulting changes Signed-off-by: Jonathan West --- controllers/argocd_metrics_controller.go | 2 +- .../e2e/ginkgo/fixture/gitserver/server.go | 11 +++---- .../ginkgo/parallel/1-141_source_hydrator.go | 15 +++++---- ...ent_env_args_for_tls_configuration_test.go | 4 +-- ...e_argocd_agent_destination_mapping_test.go | 31 +++++++++---------- .../1-114_validate_imagepullpolicy_test.go | 5 ++- ...ndle_terminating_source_namespaces_test.go | 5 ++- ...idate_sensitive_annotation_masking_test.go | 3 +- .../1-134_validate_gitops_promoter_test.go | 31 +++++++++---------- 9 files changed, 50 insertions(+), 57 deletions(-) diff --git a/controllers/argocd_metrics_controller.go b/controllers/argocd_metrics_controller.go index 64546ce0b4f..8cb01e5f665 100644 --- a/controllers/argocd_metrics_controller.go +++ b/controllers/argocd_metrics_controller.go @@ -691,7 +691,7 @@ func newAlertRule(name, severity, duration, expr, summary, description string) m "description": description, }, Expr: intstr.FromString(expr), - For: ptr.To(monitoringv1.Duration(duration)), + For: new(monitoringv1.Duration(duration)), Labels: map[string]string{ "severity": severity, }, diff --git a/test/openshift/e2e/ginkgo/fixture/gitserver/server.go b/test/openshift/e2e/ginkgo/fixture/gitserver/server.go index 9295dce9b17..7da763fb0c6 100644 --- a/test/openshift/e2e/ginkgo/fixture/gitserver/server.go +++ b/test/openshift/e2e/ginkgo/fixture/gitserver/server.go @@ -13,7 +13,6 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" routev1 "github.com/openshift/api/route/v1" @@ -183,7 +182,7 @@ func StartServer(ctx context.Context, k8sClient client.Client, ns *corev1.Namesp }, Spec: corev1.PodSpec{ SecurityContext: &corev1.PodSecurityContext{ - FSGroup: ptr.To(int64(1000)), + FSGroup: new(int64(1000)), }, Containers: []corev1.Container{ { @@ -211,12 +210,12 @@ func StartServer(ctx context.Context, k8sClient client.Client, ns *corev1.Namesp PeriodSeconds: 5, }, SecurityContext: &corev1.SecurityContext{ - RunAsUser: ptr.To(int64(1000)), - RunAsGroup: ptr.To(int64(1000)), + RunAsUser: new(int64(1000)), + RunAsGroup: new(int64(1000)), SeccompProfile: &corev1.SeccompProfile{ Type: corev1.SeccompProfileTypeRuntimeDefault, }, - AllowPrivilegeEscalation: ptr.To(false), + AllowPrivilegeEscalation: new(false), Capabilities: &corev1.Capabilities{ Drop: []corev1.Capability{ "ALL", @@ -297,7 +296,7 @@ func StartServer(ctx context.Context, k8sClient client.Client, ns *corev1.Namesp To: routev1.RouteTargetReference{ Kind: "Service", Name: service.Name, - Weight: ptr.To(int32(100)), + Weight: new(int32(100)), }, Port: &routev1.RoutePort{ TargetPort: intstr.FromString("https"), diff --git a/test/openshift/e2e/ginkgo/parallel/1-141_source_hydrator.go b/test/openshift/e2e/ginkgo/parallel/1-141_source_hydrator.go index 33c98341e4e..8e5b9daa015 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-141_source_hydrator.go +++ b/test/openshift/e2e/ginkgo/parallel/1-141_source_hydrator.go @@ -11,7 +11,6 @@ import ( v1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/redhat-developer/gitops-operator/argocd-operator/common" @@ -158,13 +157,13 @@ patches: By("Running when enabled") argocdFixture.Update(argoCD, func(argoCD *argov1beta1api.ArgoCD) { - argoCD.Spec.SourceHydrator.Enabled = ptr.To(true) + argoCD.Spec.SourceHydrator.Enabled = new(true) }) assertRunning(true) By("Not running when disabled") argocdFixture.Update(argoCD, func(argoCD *argov1beta1api.ArgoCD) { - argoCD.Spec.SourceHydrator.Enabled = ptr.To(false) + argoCD.Spec.SourceHydrator.Enabled = new(false) }) assertRunning(false) }) @@ -220,7 +219,7 @@ patches: }, Spec: argov1beta1api.ArgoCDSpec{ SourceHydrator: argov1beta1api.ArgoCDSourceHydratorSpec{ - Enabled: ptr.To(true), + Enabled: new(true), }, CommitServer: argov1beta1api.ArgoCDCommitServerSpec{ LogLevel: logLevel, @@ -321,7 +320,7 @@ patches: Keys: server.SSHKnownHosts(), }, SourceHydrator: argov1beta1api.ArgoCDSourceHydratorSpec{ - Enabled: ptr.To(true), + Enabled: new(true), }, // Expose host for the git push webhook to work. Server: argov1beta1api.ArgoCDServerSpec{ @@ -371,8 +370,8 @@ patches: }, SyncPolicy: &argocdv1alpha1.SyncPolicy{ Automated: &argocdv1alpha1.SyncPolicyAutomated{ - Prune: ptr.To(true), - SelfHeal: ptr.To(true), + Prune: new(true), + SelfHeal: new(true), }, }, }, @@ -428,7 +427,7 @@ patches: }, }, SourceHydrator: argov1beta1api.ArgoCDSourceHydratorSpec{ - Enabled: ptr.To(true), + Enabled: new(true), }, // Expose host for the git push webhook to work. Server: argov1beta1api.ArgoCDServerSpec{ diff --git a/test/openshift/e2e/ginkgo/parallel/1-143_validate_deployment_env_args_for_tls_configuration_test.go b/test/openshift/e2e/ginkgo/parallel/1-143_validate_deployment_env_args_for_tls_configuration_test.go index 52b7f48373d..e4d5b22b097 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-143_validate_deployment_env_args_for_tls_configuration_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-143_validate_deployment_env_args_for_tls_configuration_test.go @@ -53,7 +53,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { }) // --- Helper: Extract TLS values from args --- getTLSValues := func(args []string) (min string, hasMin bool, hasCiphers bool, ciphers string) { - for i := 0; i < len(args); i++ { + for i := range args { arg := args[i] // handle --tlsminversion if arg == "--tlsminversion" { @@ -214,7 +214,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { hasProtocols := false hasCiphersTLS12 := false hasCiphersTLS13 := false - for i := 0; i < len(args); i++ { + for i := range args { arg := args[i] // --- Handle "--tls-protocols " if arg == "--tls-protocols" { diff --git a/test/openshift/e2e/ginkgo/sequential/1-054_validate_argocd_agent_destination_mapping_test.go b/test/openshift/e2e/ginkgo/sequential/1-054_validate_argocd_agent_destination_mapping_test.go index ba6012014b7..d00d16bbd62 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-054_validate_argocd_agent_destination_mapping_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-054_validate_argocd_agent_destination_mapping_test.go @@ -34,7 +34,6 @@ import ( rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/argoproj/argo-cd/gitops-engine/pkg/health" @@ -118,12 +117,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, Spec: argov1beta1api.ArgoCDSpec{ Controller: argov1beta1api.ArgoCDApplicationControllerSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, ArgoCDAgent: &argov1beta1api.ArgoCDAgentSpec{ Principal: &argov1beta1api.PrincipalSpec{ - Enabled: ptr.To(true), - DestinationBasedMapping: ptr.To(true), + Enabled: new(true), + DestinationBasedMapping: new(true), Auth: "mtls:CN=([^,]+)", LogLevel: "debug", Image: destMapAgentImage, @@ -133,15 +132,15 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, }, TLS: &argov1beta1api.PrincipalTLSSpec{ - InsecureGenerate: ptr.To(false), + InsecureGenerate: new(false), }, JWT: &argov1beta1api.PrincipalJWTSpec{ - InsecureGenerate: ptr.To(false), + InsecureGenerate: new(false), }, Server: &argov1beta1api.PrincipalServerSpec{ KeepAliveMinInterval: "30s", Route: argov1beta1api.ArgoCDAgentPrincipalRouteSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, Service: argov1beta1api.ArgoCDAgentPrincipalServiceSpec{ Type: corev1.ServiceTypeLoadBalancer, @@ -149,7 +148,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, }, Agent: &argov1beta1api.AgentSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, }, }, @@ -166,17 +165,17 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, Spec: argov1beta1api.ArgoCDSpec{ Server: argov1beta1api.ArgoCDServerSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, SourceNamespaces: []string{ destMapNsAgent, }, ArgoCDAgent: &argov1beta1api.ArgoCDAgentSpec{ Principal: &argov1beta1api.PrincipalSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, Agent: &argov1beta1api.AgentSpec{ - Enabled: ptr.To(true), + Enabled: new(true), Creds: "mtls:any", LogLevel: "debug", Image: destMapAgentImage, @@ -192,11 +191,11 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { TLS: &argov1beta1api.AgentTLSSpec{ SecretName: destMapClientTLSSecretName, RootCASecretName: destMapRootCASecretName, - Insecure: ptr.To(false), + Insecure: new(false), }, DestinationBasedMapping: &argov1beta1api.DestinationBasedMappingSpec{ - Enabled: ptr.To(true), - CreateNamespace: ptr.To(true), + Enabled: new(true), + CreateNamespace: new(true), }, AllowedNamespaces: []string{ destMapNsAgent, @@ -251,8 +250,8 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, SyncPolicy: &argocdv1alpha1.SyncPolicy{ Automated: &argocdv1alpha1.SyncPolicyAutomated{ - Prune: ptr.To(true), - SelfHeal: ptr.To(true), + Prune: new(true), + SelfHeal: new(true), }, ManagedNamespaceMetadata: &argocdv1alpha1.ManagedNamespaceMetadata{ Labels: map[string]string{ diff --git a/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go b/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go index ae287c50f4a..4f825fd23e6 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-114_validate_imagepullpolicy_test.go @@ -31,7 +31,6 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -152,7 +151,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", ArgocdNamespace.Name) argocdFixture.Update(argocdInstance, func(ac *argov1beta1api.ArgoCD) { ac.Spec.ApplicationSet = &argov1beta1api.ArgoCDApplicationSet{ - Enabled: ptr.To(bool(true)), + Enabled: new(bool(true)), } }) @@ -214,7 +213,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", ArgocdNamespace.Name) argocdFixture.Update(argocdInstance, func(ac *argov1beta1api.ArgoCD) { ac.Spec.ApplicationSet = &argov1beta1api.ArgoCDApplicationSet{ - Enabled: ptr.To(bool(true)), + Enabled: new(bool(true)), } }) diff --git a/test/openshift/e2e/ginkgo/sequential/1-132_validate_handle_terminating_source_namespaces_test.go b/test/openshift/e2e/ginkgo/sequential/1-132_validate_handle_terminating_source_namespaces_test.go index 4d9960f0a8c..b260dea6c70 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-132_validate_handle_terminating_source_namespaces_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-132_validate_handle_terminating_source_namespaces_test.go @@ -38,7 +38,6 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -215,8 +214,8 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Project: "default", SyncPolicy: &argocdv1alpha1.SyncPolicy{ Automated: &argocdv1alpha1.SyncPolicyAutomated{ - Prune: ptr.To(true), - SelfHeal: ptr.To(true), + Prune: new(true), + SelfHeal: new(true), }, }, }, diff --git a/test/openshift/e2e/ginkgo/sequential/1-132_validate_sensitive_annotation_masking_test.go b/test/openshift/e2e/ginkgo/sequential/1-132_validate_sensitive_annotation_masking_test.go index 843cc725aa3..4dee73a6a87 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-132_validate_sensitive_annotation_masking_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-132_validate_sensitive_annotation_masking_test.go @@ -37,7 +37,6 @@ import ( fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -163,7 +162,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { // SelfHeal is disabled to make the test deterministic: without it // ArgoCD would still auto-sync (reverting the annotation) on the // next periodic cycle before the Consistently check completes. - SelfHeal: ptr.To(false), + SelfHeal: new(false), }, }, }, diff --git a/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go b/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go index b0d9cb7a4ed..2d437e17ddc 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-134_validate_gitops_promoter_test.go @@ -29,7 +29,6 @@ import ( rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" argov1beta1api "github.com/redhat-developer/gitops-operator/argocd-operator/api/v1beta1" @@ -101,19 +100,19 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, Spec: argov1beta1api.ArgoCDSpec{ Promoter: &argov1beta1api.PromoterSpec{ - Enabled: ptr.To(true), + Enabled: new(true), }, Controller: argov1beta1api.ArgoCDApplicationControllerSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, Server: argov1beta1api.ArgoCDServerSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, Repo: argov1beta1api.ArgoCDRepoSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, Redis: argov1beta1api.ArgoCDRedisSpec{ - Enabled: ptr.To(false), + Enabled: new(false), }, }, } @@ -242,7 +241,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { promoterFixture.VerifyExpectedResourcesExist(apiServerResources) argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { - ac.Spec.Promoter.Enabled = ptr.To(false) + ac.Spec.Promoter.Enabled = new(false) }) By("Verify that Controller resources were deleted") @@ -256,7 +255,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { By("Create Argo CD Instance with Promoter's API Server enabled") argoCD.Spec.Promoter.APIServer = &argov1beta1api.PromoterAPIServerSpec{} - argoCD.Spec.Promoter.APIServer.Enabled = ptr.To(true) + argoCD.Spec.Promoter.APIServer.Enabled = new(true) Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) apiServerResources := promoterFixture.VerifyExpectedResourcesExistParams{ @@ -278,7 +277,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter.APIServer = &argov1beta1api.PromoterAPIServerSpec{ - Enabled: ptr.To(false), + Enabled: new(false), } }) promoterFixture.VerifyExpectedResourcesDontExist(apiServerResources) @@ -287,7 +286,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter.APIServer = &argov1beta1api.PromoterAPIServerSpec{ - Enabled: ptr.To(true), + Enabled: new(true), } }) promoterFixture.VerifyExpectedResourcesExist(apiServerResources) @@ -307,7 +306,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter.Webhook = &argov1beta1api.PromoterControllerWebhookSpec{ - Enabled: ptr.To(true), + Enabled: new(true), } }) promoterFixture.VerifyExpectedResourcesExist(webhookResources) @@ -316,7 +315,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter.Webhook = &argov1beta1api.PromoterControllerWebhookSpec{ - Enabled: ptr.To(true), + Enabled: new(true), ServiceType: "NodePort", } }) @@ -331,7 +330,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter.Webhook = &argov1beta1api.PromoterControllerWebhookSpec{ - Enabled: ptr.To(false), + Enabled: new(false), } }) promoterFixture.VerifyExpectedResourcesDontExist(webhookResources) @@ -346,7 +345,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { CABundleSecretKey: apiServerCABundleSecretKey, CertSecretName: apiServerTLSSecretName, }, - Enabled: ptr.To(true), + Enabled: new(true), } createAPIServerTLSSecrets(ns) @@ -394,7 +393,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, Spec: argov1beta1api.ArgoCDSpec{ Promoter: &argov1beta1api.PromoterSpec{ - Enabled: ptr.To(true), + Enabled: new(true), ArgoCDUIExtensionEnabled: true, }, }, @@ -448,7 +447,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { By("verify that disabling the extension cleans up its settings") argoCDFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) { ac.Spec.Promoter = &argov1beta1api.PromoterSpec{ - Enabled: ptr.To(true), + Enabled: new(true), ArgoCDUIExtensionEnabled: false, } }) From 7ceacb5de194badb4b0770a1a7365759ade877aa Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Mon, 26 Oct 2026 09:02:30 -0400 Subject: [PATCH 4/5] chore: update to latest prometheus-operator Signed-off-by: Jonathan West --- argocd-operator/go.mod | 94 +++++++++++++++++++++--------------------- argocd-operator/go.sum | 56 ++++++++++++------------- go.mod | 92 +++++++++++++++++++++-------------------- go.sum | 56 ++++++++++++------------- 4 files changed, 152 insertions(+), 146 deletions(-) diff --git a/argocd-operator/go.mod b/argocd-operator/go.mod index becd5e3015a..54035924102 100644 --- a/argocd-operator/go.mod +++ b/argocd-operator/go.mod @@ -21,13 +21,13 @@ require ( go.uber.org/zap v1.28.0 // indirect golang.org/x/mod v0.42.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.37.0 - k8s.io/apiextensions-apiserver v0.37.0 - k8s.io/apimachinery v0.37.0 - k8s.io/client-go v0.37.0 - k8s.io/kube-aggregator v0.36.1 + k8s.io/api v0.36.2 + k8s.io/apiextensions-apiserver v0.36.2 + k8s.io/apimachinery v0.36.2 + k8s.io/client-go v0.36.2 + k8s.io/kube-aggregator v0.36.2 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 - sigs.k8s.io/controller-runtime v0.25.0 + sigs.k8s.io/controller-runtime v0.24.1 sigs.k8s.io/yaml v1.6.0 ) @@ -69,7 +69,7 @@ require ( go.uber.org/atomic v1.11.0 // indirect google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect - k8s.io/streaming v0.37.0 // indirect + k8s.io/streaming v0.36.2 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect ) @@ -193,14 +193,14 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - k8s.io/apiserver v0.37.0 // indirect - k8s.io/cli-runtime v0.36.1 // indirect - k8s.io/component-base v0.37.0 // indirect - k8s.io/component-helpers v0.36.1 // indirect - k8s.io/controller-manager v0.36.1 // indirect + k8s.io/apiserver v0.36.2 // indirect + k8s.io/cli-runtime v0.36.2 // indirect + k8s.io/component-base v0.36.2 // indirect + k8s.io/component-helpers v0.36.2 // indirect + k8s.io/controller-manager v0.36.2 // indirect k8s.io/klog/v2 v2.140.0 // indirect k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 // indirect - k8s.io/kubectl v0.36.1 // indirect + k8s.io/kubectl v0.36.2 // indirect k8s.io/kubernetes v1.36.1 // indirect oras.land/oras-go/v2 v2.6.2 // indirect sigs.k8s.io/gateway-api v1.5.0 // indirect @@ -223,37 +223,39 @@ replace ( // Avoid CVE-2022-3064 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 - k8s.io/api => k8s.io/api v0.36.1 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.36.1 - k8s.io/apiserver => k8s.io/apiserver v0.36.1 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.1 - k8s.io/client-go => k8s.io/client-go v0.36.1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.1 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.1 - k8s.io/code-generator => k8s.io/code-generator v0.36.1 - k8s.io/component-base => k8s.io/component-base v0.36.1 - k8s.io/component-helpers => k8s.io/component-helpers v0.36.1 - k8s.io/controller-manager => k8s.io/controller-manager v0.36.1 - k8s.io/cri-api => k8s.io/cri-api v0.36.1 - k8s.io/cri-client => k8s.io/cri-client v0.36.1 - k8s.io/cri-streaming => k8s.io/cri-streaming v0.36.1 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.1 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.1 - k8s.io/endpointslice => k8s.io/endpointslice v0.36.1 - k8s.io/externaljwt => k8s.io/externaljwt v0.36.1 - k8s.io/kms => k8s.io/kms v0.36.1 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.1 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.1 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.1 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.1 - k8s.io/kubectl => k8s.io/kubectl v0.36.1 - k8s.io/kubelet => k8s.io/kubelet v0.36.1 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.36.1 - k8s.io/metrics => k8s.io/metrics v0.36.1 - k8s.io/mount-utils => k8s.io/mount-utils v0.36.1 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.1 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.1 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.36.1 - k8s.io/sample-controller => k8s.io/sample-controller v0.36.1 + k8s.io/api => k8s.io/api v0.36.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.36.2 + k8s.io/apiserver => k8s.io/apiserver v0.36.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.2 + k8s.io/client-go => k8s.io/client-go v0.36.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.2 + k8s.io/code-generator => k8s.io/code-generator v0.36.2 + k8s.io/component-base => k8s.io/component-base v0.36.2 + k8s.io/component-helpers => k8s.io/component-helpers v0.36.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.36.2 + k8s.io/cri-api => k8s.io/cri-api v0.36.2 + k8s.io/cri-client => k8s.io/cri-client v0.36.2 + k8s.io/cri-streaming => k8s.io/cri-streaming v0.36.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.36.2 + k8s.io/externaljwt => k8s.io/externaljwt v0.36.2 + k8s.io/kms => k8s.io/kms v0.36.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.2 + k8s.io/kubectl => k8s.io/kubectl v0.36.2 + k8s.io/kubelet => k8s.io/kubelet v0.36.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.36.2 + k8s.io/metrics => k8s.io/metrics v0.36.2 + k8s.io/mount-utils => k8s.io/mount-utils v0.36.2 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.2 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.36.2 + k8s.io/sample-controller => k8s.io/sample-controller v0.36.2 ) + +replace k8s.io/streaming => k8s.io/streaming v0.36.2 diff --git a/argocd-operator/go.sum b/argocd-operator/go.sum index 01b4a5e76e1..e74b792bbb8 100644 --- a/argocd-operator/go.sum +++ b/argocd-operator/go.sum @@ -658,44 +658,44 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY= -k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo= -k8s.io/apiextensions-apiserver v0.36.1 h1:6JfYmPUsuUIHuN+3QxutXYWj492RqF5fBSx67GYK5Ks= -k8s.io/apiextensions-apiserver v0.36.1/go.mod h1:pLzZin90riwisdzKwv/GoTwENooytoIx5zWJb4Hkby8= -k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA= -k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8= -k8s.io/apiserver v0.36.1 h1:iMS5V+rPUertv5P9RaqJgmHHTuh4quWpoxchvMUY+JY= -k8s.io/apiserver v0.36.1/go.mod h1:Cby1PbLWztu0GDOxoO6iFOyyqIsziHNEW+w9zVQ22Kw= -k8s.io/cli-runtime v0.36.1 h1:yuC/BGnnj1YYPh6D1P+pZnzinCs6DvMq86yAeNqoqzM= -k8s.io/cli-runtime v0.36.1/go.mod h1:ZQWHGt8xAF7KnviB79vX0lYNyUUqKIpU+LQg7exuFAw= -k8s.io/client-go v0.36.1 h1:FN/K8QIT2CEDt+2WB2HnWrUANZ50AP5GII43/SP2JR0= -k8s.io/client-go v0.36.1/go.mod h1:s6rAnCtTGYDQnpNjEhSaISV+2O8jwruZ6m3QOYBFbtU= -k8s.io/component-base v0.36.1 h1:iG6GsELftXqTNG9HG6kiVjatSgAw1sf5pJ6R5a6N0kA= -k8s.io/component-base v0.36.1/go.mod h1:nf9XPlntRdqO6WMeEWAA5F93Y4ICZQdeT9GeqLDB3JI= -k8s.io/component-helpers v0.36.1 h1:BTrr5fzNSm8TkQfXrKT3N9ioWwiC4n2FTIwGTUo/ccg= -k8s.io/component-helpers v0.36.1/go.mod h1:s38HnzKQRurbUnhI5IV8GwyL/a3lVuNCYZMTd+rITMM= -k8s.io/controller-manager v0.36.1 h1:d1ifPnAe3FFSnnvcDQiM93bGroFT1lF72GEBKsl+cbg= -k8s.io/controller-manager v0.36.1/go.mod h1:jeJUuFlgbgohGJWrm59Wdlgo3WqxssWXgD2sU6HG/Vo= +k8s.io/api v0.36.2 h1:TF6YDLIzKfccK7cq9YpTcGX8TJmEkHVRv78DM51fRYY= +k8s.io/api v0.36.2/go.mod h1:F4LbMO4brjZYh7yFkXWhynSvtB7YauxV4c+HHkNRGNg= +k8s.io/apiextensions-apiserver v0.36.2 h1:3O5gqOj/dt2XWWbpMe+TXWpE9yU6pjM/tXxtHHJT/K4= +k8s.io/apiextensions-apiserver v0.36.2/go.mod h1:cL1tBWe8XSaP1H30iWKGo7hf6iAUUUJPEU70dskmAnA= +k8s.io/apimachinery v0.36.2 h1:0PE/W/WNy1UX61NLbXY5TMbJ6UwLL6E6lAPkYrKFxbQ= +k8s.io/apimachinery v0.36.2/go.mod h1:fvf/HOLXq9RId0rnDIbN1OEBvHXdQbLMM8nu0LcBUf4= +k8s.io/apiserver v0.36.2 h1:6vMnkmHZPeBloNkHUhmZYq7Ylv8WIB8xjyEl+eSt26E= +k8s.io/apiserver v0.36.2/go.mod h1:9PoQ2ikCytrZyZg11mGhLEF5m8Rgsb5FJmYJ4Wvnl1k= +k8s.io/cli-runtime v0.36.2 h1:CconTvEeV4DJs4ZX3HQKCFbFRGsm6OtuBM9yjmMP2VM= +k8s.io/cli-runtime v0.36.2/go.mod h1:LddcjiMf4YlnHO7c1Y7rEtDqL84FyiYVLco7V679GUU= +k8s.io/client-go v0.36.2 h1:bfgxmFKc9CgqsgX4xKLAAdmTQlWee7Ob/HlDOrJ5TBI= +k8s.io/client-go v0.36.2/go.mod h1:1vgO4OAlfPnoLcb+Rze2GF5rAr14w8qjrYMoyXJzQj0= +k8s.io/component-base v0.36.2 h1:Z0VH80O7Ng0HDZnZj3WRR3urEGa0kTwmO8CwEwjVK1w= +k8s.io/component-base v0.36.2/go.mod h1:mGfFOA7Gwpdm1VW2cwSQYbiDIlz8GD2WGwH88QSeCyA= +k8s.io/component-helpers v0.36.2 h1:YsqocS183ThSUw90OXsxkKxIgdQF4qWInwrn6pZdDH8= +k8s.io/component-helpers v0.36.2/go.mod h1:YrHgzezjsyXAFq9+gKw6IbgJg7IHEUVwK41eEAiTRR4= +k8s.io/controller-manager v0.36.2 h1:uQrvXNDPsjDy3q7cECuFufUfmWhjQQccvVoUGLXcQPw= +k8s.io/controller-manager v0.36.2/go.mod h1:VGcOtE1E71vmt3tDIAdG/rQxzwNb6YE5us+paWyZtOQ= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= -k8s.io/kube-aggregator v0.36.1 h1:IzNeRsJcTtgsiCyTgCR1pSwWCrXC1QZQWMTcBw18cFQ= -k8s.io/kube-aggregator v0.36.1/go.mod h1:ROrIm5irUhVUJsKVCgBAAcXpK5IiqpdCn0Ka7LYMGs4= +k8s.io/kube-aggregator v0.36.2 h1:zfeH9Fs16oDquNfBZef3M27dGG3QtJ9/TwkWfBlw1lo= +k8s.io/kube-aggregator v0.36.2/go.mod h1:UMrB5DfEhznFTf0bqYW2SV26GDy8HNaxoYakvKVWZ8M= k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 h1:z5+pcu1jTyKK5mNTe2/+x+U6Uuv9jRVOJQLaBJJMpeI= k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= -k8s.io/kubectl v0.36.1 h1:96HqS9twIdHM0MlJLTwbo14b9kUKPkOzZ4tlRDLv4qI= -k8s.io/kubectl v0.36.1/go.mod h1:/DGPAIewKsFWF9VFgGvkPhao2Ev4SNuE3BioZo8yPbk= -k8s.io/kubelet v0.36.1 h1:FcHiG9wv92xerRPNxztuhYWqwS4IilOQNPxTPQewYgo= -k8s.io/kubelet v0.36.1/go.mod h1:e6IeoCwqc2TbneCKu6P8HjmWLi7U6SOh3Pocs32iGFM= +k8s.io/kubectl v0.36.2 h1:rpUGGpeL09XVOLep2yle5jrtk//JA1L6ZHfkQQtVEwk= +k8s.io/kubectl v0.36.2/go.mod h1:gVbQ3B/yb4bSR2ggQ7rd0W6icUSWs7sduH4e16Vii+0= +k8s.io/kubelet v0.36.2 h1:9x+Tf8TEFYCcHdClzYL+IgDpfqbi+qqSdIIcXVKvr7k= +k8s.io/kubelet v0.36.2/go.mod h1:APRnAz9lmKmKsQunzUrZgQOm0k0f+NG9YxIrFCYYxcU= k8s.io/kubernetes v1.36.1 h1:Mt7NKigaZ2KmOmCLhX81lGlH9JU5wjXnYhXnxAun9XA= k8s.io/kubernetes v1.36.1/go.mod h1:MLdeJ3qw2CWH9BFml5GvptxQVQckz54fJOZ/WuixpFE= -k8s.io/streaming v0.37.0 h1:iPBUZLZiKt5bV+lxJurASMOV07VuBhNpiwJt2//AWrM= -k8s.io/streaming v0.37.0/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= +k8s.io/streaming v0.36.2 h1:NSKthPPg9UFSKsRauVJUVGH2Dvn8fhKmY4qrMkw/p98= +k8s.io/streaming v0.36.2/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= -sigs.k8s.io/controller-runtime v0.25.0 h1:44KgRUPew331KSJpNu8zJow3iTR5W0p/SfrHdw3lV40= -sigs.k8s.io/controller-runtime v0.25.0/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= +sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= +sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= sigs.k8s.io/gateway-api v1.5.0 h1:duoo14Ky/fJXpjpmyMISE2RTBGnfCg8zICfTYLTnBJA= sigs.k8s.io/gateway-api v1.5.0/go.mod h1:GvCETiaMAlLym5CovLxGjS0NysqFk3+Yuq3/rh6QL2o= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= diff --git a/go.mod b/go.mod index 473c690e65e..44453bf5ab0 100644 --- a/go.mod +++ b/go.mod @@ -31,13 +31,13 @@ require ( golang.org/x/mod v0.42.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible - k8s.io/api v0.37.0 - k8s.io/apiextensions-apiserver v0.37.0 - k8s.io/apimachinery v0.37.0 - k8s.io/client-go v0.37.0 + k8s.io/api v0.36.4 + k8s.io/apiextensions-apiserver v0.36.4 + k8s.io/apimachinery v0.36.4 + k8s.io/client-go v0.36.4 k8s.io/kube-aggregator v0.36.2 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 - sigs.k8s.io/controller-runtime v0.25.0 + sigs.k8s.io/controller-runtime v0.24.1 sigs.k8s.io/yaml v1.6.0 ) @@ -201,16 +201,16 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiserver v0.37.0 // indirect - k8s.io/cli-runtime v0.36.4 // indirect - k8s.io/component-base v0.37.0 // indirect - k8s.io/component-helpers v0.36.4 // indirect - k8s.io/controller-manager v0.36.1 // indirect + k8s.io/apiserver v0.36.4 // indirect + k8s.io/cli-runtime v0.36.2 // indirect + k8s.io/component-base v0.36.4 // indirect + k8s.io/component-helpers v0.36.2 // indirect + k8s.io/controller-manager v0.36.2 // indirect k8s.io/klog/v2 v2.140.0 // indirect k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 // indirect - k8s.io/kubectl v0.36.1 // indirect + k8s.io/kubectl v0.36.2 // indirect k8s.io/kubernetes v1.36.1 // indirect - k8s.io/streaming v0.37.0 // indirect + k8s.io/streaming v0.36.4 // indirect oras.land/oras-go/v2 v2.6.2 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect sigs.k8s.io/gateway-api v1.6.0 // indirect @@ -237,36 +237,40 @@ replace ( // Avoid CVE-2022-28948 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 - k8s.io/api => k8s.io/api v0.36.4 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.4 - k8s.io/apimachinery => k8s.io/apimachinery v0.36.4 - k8s.io/apiserver => k8s.io/apiserver v0.36.4 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.4 - k8s.io/client-go => k8s.io/client-go v0.36.4 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.4 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.4 - k8s.io/code-generator => k8s.io/code-generator v0.36.4 - k8s.io/component-base => k8s.io/component-base v0.36.4 - k8s.io/component-helpers => k8s.io/component-helpers v0.36.4 - k8s.io/controller-manager => k8s.io/controller-manager v0.36.4 - k8s.io/cri-api => k8s.io/cri-api v0.36.4 - k8s.io/cri-client => k8s.io/cri-client v0.36.4 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.4 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.4 - k8s.io/endpointslice => k8s.io/endpointslice v0.36.4 - k8s.io/externaljwt => k8s.io/externaljwt v0.36.4 - k8s.io/kms => k8s.io/kms v0.36.4 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.4 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.4 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.4 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.4 - k8s.io/kubectl => k8s.io/kubectl v0.36.4 - k8s.io/kubelet => k8s.io/kubelet v0.36.4 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.36.4 - k8s.io/metrics => k8s.io/metrics v0.36.4 - k8s.io/mount-utils => k8s.io/mount-utils v0.36.4 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.4 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.4 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.36.4 - k8s.io/sample-controller => k8s.io/sample-controller v0.36.4 + k8s.io/api => k8s.io/api v0.36.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.36.2 + k8s.io/apiserver => k8s.io/apiserver v0.36.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.2 + k8s.io/client-go => k8s.io/client-go v0.36.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.2 + k8s.io/code-generator => k8s.io/code-generator v0.36.2 + k8s.io/component-base => k8s.io/component-base v0.36.2 + k8s.io/component-helpers => k8s.io/component-helpers v0.36.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.36.2 + k8s.io/cri-api => k8s.io/cri-api v0.36.2 + k8s.io/cri-client => k8s.io/cri-client v0.36.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.36.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.36.2 + k8s.io/externaljwt => k8s.io/externaljwt v0.36.2 + k8s.io/kms => k8s.io/kms v0.36.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.2 + k8s.io/kubectl => k8s.io/kubectl v0.36.2 + k8s.io/kubelet => k8s.io/kubelet v0.36.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.36.2 + k8s.io/metrics => k8s.io/metrics v0.36.2 + k8s.io/mount-utils => k8s.io/mount-utils v0.36.2 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.2 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.36.2 + k8s.io/sample-controller => k8s.io/sample-controller v0.36.2 ) + +replace k8s.io/streaming => k8s.io/streaming v0.36.2 + +replace k8s.io/cri-streaming => k8s.io/cri-streaming v0.36.2 diff --git a/go.sum b/go.sum index 96d6adc6685..703571ee280 100644 --- a/go.sum +++ b/go.sum @@ -684,46 +684,46 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.36.4 h1:RxrvqCL6vgH5/+UnTeu1IIFqYmGfy0hnyrod1rn35Oo= -k8s.io/api v0.36.4/go.mod h1:S2B3orCFBDhrgyWbLeuKcT2QdHIpQesBkCYSlWtwUOw= -k8s.io/apiextensions-apiserver v0.36.4 h1:SfvCVt+4CqKWvzuVytYDT5g9hyb9MztoiYELIkPVrFc= -k8s.io/apiextensions-apiserver v0.36.4/go.mod h1:JT9V2Ju7ys1FY4zbSpmX9XOvKB3/BwsODc4hFQEa+Xo= -k8s.io/apimachinery v0.36.4 h1:PT2UzkupGuAx/+xT5XjiMJ1WGpY3fn9/hdAvjweRet4= -k8s.io/apimachinery v0.36.4/go.mod h1:p2I2dipt7JHG+quVwQ1d02d28O4GdDi77RByQ13MTpk= -k8s.io/apiserver v0.36.4 h1:AtKjaf2eUiX5G6TfF2IOlhuUuvMsHh49Ivr1+4fZ2gA= -k8s.io/apiserver v0.36.4/go.mod h1:RyiGghXP67hb0Ll+7iLJ6GGv2JpEzCn7ljbiA+L3cJ0= -k8s.io/cli-runtime v0.36.4 h1:OHvManCwP1k9GiC5tXRFxHhzZIQQFCsrHlt7OspKo3w= -k8s.io/cli-runtime v0.36.4/go.mod h1:qQSj2FJgQos6GHpS/ge7wTdQMZm9XFWlesWgV6h7qZY= -k8s.io/client-go v0.36.4 h1:MDvfDNvMSt0Br94SK8neviVlwL9qifw9B26hJCpD1K0= -k8s.io/client-go v0.36.4/go.mod h1:pNK4WKELbwlEDvtbE8l22lEZL5THYF61H5EealokZmA= -k8s.io/component-base v0.36.4 h1:tz75yC2xgq3kd7vPdBtR8do5iMx0OHf6Zd1kuaxDB84= -k8s.io/component-base v0.36.4/go.mod h1:DCwb306U8ou89NNAp45Csuy8ok+1rp1ELDVPhzN5AWc= -k8s.io/component-helpers v0.36.4 h1:B5+SnptAlwTVJO0MW1JLsZVp4KevlADRg0CX5YFzjbU= -k8s.io/component-helpers v0.36.4/go.mod h1:RECUDkRdVuxcNOAl9/EK7lmy1TIjoWkBHs6f0uOyoCs= -k8s.io/controller-manager v0.36.4 h1:YG03tVDUY+BGLRTsNKY0Vms3lsCdq/314DW3IGZfZig= -k8s.io/controller-manager v0.36.4/go.mod h1:63s+JKgdrkqQl3AI2PovT22YMaiXC1i80/LRGLlFVjo= +k8s.io/api v0.36.2 h1:TF6YDLIzKfccK7cq9YpTcGX8TJmEkHVRv78DM51fRYY= +k8s.io/api v0.36.2/go.mod h1:F4LbMO4brjZYh7yFkXWhynSvtB7YauxV4c+HHkNRGNg= +k8s.io/apiextensions-apiserver v0.36.2 h1:3O5gqOj/dt2XWWbpMe+TXWpE9yU6pjM/tXxtHHJT/K4= +k8s.io/apiextensions-apiserver v0.36.2/go.mod h1:cL1tBWe8XSaP1H30iWKGo7hf6iAUUUJPEU70dskmAnA= +k8s.io/apimachinery v0.36.2 h1:0PE/W/WNy1UX61NLbXY5TMbJ6UwLL6E6lAPkYrKFxbQ= +k8s.io/apimachinery v0.36.2/go.mod h1:fvf/HOLXq9RId0rnDIbN1OEBvHXdQbLMM8nu0LcBUf4= +k8s.io/apiserver v0.36.2 h1:6vMnkmHZPeBloNkHUhmZYq7Ylv8WIB8xjyEl+eSt26E= +k8s.io/apiserver v0.36.2/go.mod h1:9PoQ2ikCytrZyZg11mGhLEF5m8Rgsb5FJmYJ4Wvnl1k= +k8s.io/cli-runtime v0.36.2 h1:CconTvEeV4DJs4ZX3HQKCFbFRGsm6OtuBM9yjmMP2VM= +k8s.io/cli-runtime v0.36.2/go.mod h1:LddcjiMf4YlnHO7c1Y7rEtDqL84FyiYVLco7V679GUU= +k8s.io/client-go v0.36.2 h1:bfgxmFKc9CgqsgX4xKLAAdmTQlWee7Ob/HlDOrJ5TBI= +k8s.io/client-go v0.36.2/go.mod h1:1vgO4OAlfPnoLcb+Rze2GF5rAr14w8qjrYMoyXJzQj0= +k8s.io/component-base v0.36.2 h1:Z0VH80O7Ng0HDZnZj3WRR3urEGa0kTwmO8CwEwjVK1w= +k8s.io/component-base v0.36.2/go.mod h1:mGfFOA7Gwpdm1VW2cwSQYbiDIlz8GD2WGwH88QSeCyA= +k8s.io/component-helpers v0.36.2 h1:YsqocS183ThSUw90OXsxkKxIgdQF4qWInwrn6pZdDH8= +k8s.io/component-helpers v0.36.2/go.mod h1:YrHgzezjsyXAFq9+gKw6IbgJg7IHEUVwK41eEAiTRR4= +k8s.io/controller-manager v0.36.2 h1:uQrvXNDPsjDy3q7cECuFufUfmWhjQQccvVoUGLXcQPw= +k8s.io/controller-manager v0.36.2/go.mod h1:VGcOtE1E71vmt3tDIAdG/rQxzwNb6YE5us+paWyZtOQ= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= -k8s.io/kube-aggregator v0.36.4 h1:B593UGiOA2ivyuWOSvgWly5lXkTPLcYpeZwkq4Y+ieA= -k8s.io/kube-aggregator v0.36.4/go.mod h1:05q7hjy8iKStLM1e+BOQ8mMVPnIfAqfpkhZDPGxS0xY= +k8s.io/kube-aggregator v0.36.2 h1:zfeH9Fs16oDquNfBZef3M27dGG3QtJ9/TwkWfBlw1lo= +k8s.io/kube-aggregator v0.36.2/go.mod h1:UMrB5DfEhznFTf0bqYW2SV26GDy8HNaxoYakvKVWZ8M= k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 h1:z5+pcu1jTyKK5mNTe2/+x+U6Uuv9jRVOJQLaBJJMpeI= k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= -k8s.io/kubectl v0.36.4 h1:xZd9g1bFBd7hpb1oKjK8lT9jRL18dtgr4DAPQG1Oksk= -k8s.io/kubectl v0.36.4/go.mod h1:STWlr78cdEa1hHpr55wpcboaqchvfDueKRNDa1zOd1w= -k8s.io/kubelet v0.36.4 h1:mlmXnkrq3H02r/r0H/8M2jdPY7f4I4u4cA0tHnsPzY0= -k8s.io/kubelet v0.36.4/go.mod h1:jcOhk4E8cdUBn7WswW67WH9waQTe37G057ttnYdcaKY= +k8s.io/kubectl v0.36.2 h1:rpUGGpeL09XVOLep2yle5jrtk//JA1L6ZHfkQQtVEwk= +k8s.io/kubectl v0.36.2/go.mod h1:gVbQ3B/yb4bSR2ggQ7rd0W6icUSWs7sduH4e16Vii+0= +k8s.io/kubelet v0.36.2 h1:9x+Tf8TEFYCcHdClzYL+IgDpfqbi+qqSdIIcXVKvr7k= +k8s.io/kubelet v0.36.2/go.mod h1:APRnAz9lmKmKsQunzUrZgQOm0k0f+NG9YxIrFCYYxcU= k8s.io/kubernetes v1.36.1 h1:Mt7NKigaZ2KmOmCLhX81lGlH9JU5wjXnYhXnxAun9XA= k8s.io/kubernetes v1.36.1/go.mod h1:MLdeJ3qw2CWH9BFml5GvptxQVQckz54fJOZ/WuixpFE= -k8s.io/streaming v0.37.0 h1:iPBUZLZiKt5bV+lxJurASMOV07VuBhNpiwJt2//AWrM= -k8s.io/streaming v0.37.0/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= +k8s.io/streaming v0.36.2 h1:NSKthPPg9UFSKsRauVJUVGH2Dvn8fhKmY4qrMkw/p98= +k8s.io/streaming v0.36.2/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 h1:/YpDJ4vReG7ZmzSpBGxduXgywWkJU9zHubgJG03MT+Y= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0/go.mod h1:tJo1aepTXyR+8Xs3sUsGBDk4Ub2AM5dPAPKJx0mpm5c= -sigs.k8s.io/controller-runtime v0.25.0 h1:44KgRUPew331KSJpNu8zJow3iTR5W0p/SfrHdw3lV40= -sigs.k8s.io/controller-runtime v0.25.0/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= +sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= +sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= sigs.k8s.io/gateway-api v1.6.0 h1:735YBRj5NXFrOGX0GoSjwzUIzbz8kiEOfADsqHFmHgE= sigs.k8s.io/gateway-api v1.6.0/go.mod h1:FVfx3t389ybeXOqvDghLbdvJdSCfI/PReqCUI3lu3mY= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= From 789d3e570c48a07c1cc2e6aaec90c90d9045eb97 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Mon, 26 Oct 2026 09:21:56 -0400 Subject: [PATCH 5/5] chore: update to latest prometheus-operator Signed-off-by: Jonathan West --- .../e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go b/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go index e504ab14cf0..bf7b9bd5f9e 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-104_validate_prometheus_alert_test.go @@ -46,7 +46,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { HTTPConfigWithProxyAndTLSFiles: monitoringv1.HTTPConfigWithProxyAndTLSFiles{ HTTPConfigWithTLSFiles: monitoringv1.HTTPConfigWithTLSFiles{ HTTPConfigWithoutTLS: monitoringv1.HTTPConfigWithoutTLS{ - BearerTokenSecret: &corev1.SecretKeySelector{ + BearerTokenSecret: &corev1.SecretKeySelector{ //nolint:staticcheck // actual ServiceMonitor manifest (config/prometheus/monitor.yaml) still uses the deprecated bearerTokenSecret field LocalObjectReference: corev1.LocalObjectReference{ Name: "openshift-gitops-operator-metrics-monitor-bearer-token", },