diff --git a/.ci-operator.yaml b/.ci-operator.yaml index b1b0b48da30..17568ff59f0 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: openshift-gitops-go-toolset namespace: ci - tag: 1.25.5 + tag: 1.25.9 diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml index 4980e27b7e9..f72d1934c38 100644 --- a/bundle/manifests/argoproj.io_argocds.yaml +++ b/bundle/manifests/argoproj.io_argocds.yaml @@ -1905,7 +1905,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -18031,7 +18030,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 982fe97cca3..0d49b03634d 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -180,7 +180,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2026-03-04T06:59:29Z" + createdAt: "2026-05-20T03:47:13Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml index 56185f64d61..65ba30aa090 100644 --- a/config/crd/bases/argoproj.io_argocds.yaml +++ b/config/crd/bases/argoproj.io_argocds.yaml @@ -1894,7 +1894,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources should be created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -18020,7 +18019,6 @@ spec: NetworkPolicy resources for this Argo CD instance. properties: enabled: - default: true description: |- Enabled defines whether NetworkPolicy resources are created for this Argo CD instance. When enabled, the operator will reconcile NetworkPolicies for Argo CD components. @@ -32359,4 +32357,4 @@ spec: served: true storage: true subresources: - status: {} + status: {} \ No newline at end of file diff --git a/go.mod b/go.mod index f4b8dd7cb8d..1d8dd51773a 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/redhat-developer/gitops-operator -go 1.25.5 +go 1.25.9 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 - github.com/argoproj-labs/argocd-image-updater v1.1.1 - github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b - github.com/argoproj/argo-cd/v3 v3.3.9 + github.com/argoproj-labs/argocd-image-updater v1.1.2 + github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530 + github.com/argoproj/argo-cd/v3 v3.3.10 github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 @@ -153,9 +153,9 @@ require ( github.com/xlab/treeprint v1.2.0 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect - go.opentelemetry.io/otel v1.40.0 // indirect - go.opentelemetry.io/otel/metric v1.40.0 // indirect - go.opentelemetry.io/otel/trace v1.40.0 // indirect + go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel/metric v1.43.0 // indirect + go.opentelemetry.io/otel/trace v1.43.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect diff --git a/go.sum b/go.sum index 3684452b242..4e45f4965fb 100644 --- a/go.sum +++ b/go.sum @@ -37,12 +37,12 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67 h1:gFasfvlbOfrwzd7JaVTlnRgE7pDMFC+lQwt07gGGrbY= github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0= -github.com/argoproj-labs/argocd-image-updater v1.1.1 h1:7YDaR3WX2NMsDKp0wN7TRaRRHaVHQ94tSybi2P99MGk= -github.com/argoproj-labs/argocd-image-updater v1.1.1/go.mod h1:gMHiNrGNwNSt4ljf0ykcnmNvXBk/NJ+Z17AnZVe7V7I= -github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b h1:HxyuUUBlSPwKWSvLHnCibtR4Yz3Z6qpEm5wSi3a5oIw= -github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b/go.mod h1:J1/kP2zzXbKU5Austr4Eg3qAilMtRyQX8yu0/ALUzD0= -github.com/argoproj/argo-cd/v3 v3.3.9 h1:5etMk6bD18iIiSeRo/5zTsp6Bwn6heoVeHIeA3++SSI= -github.com/argoproj/argo-cd/v3 v3.3.9/go.mod h1:Qh80AE4vFLe5jhdI7qYareRc7YOTLDQsDEq7ghvs0Qc= +github.com/argoproj-labs/argocd-image-updater v1.1.2 h1:z7zXF30lGap5DqHdVRPWd6qtOKXh1czl5WL0iEXi3lE= +github.com/argoproj-labs/argocd-image-updater v1.1.2/go.mod h1:EpwMlbWGInyqkRhCWAD18bvgNdk/s7SUSEXtM+K9ApE= +github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530 h1:lRRwPjNFq4Ho52720p0Vn73RzJbIYMcre3nZ84uwcuU= +github.com/argoproj-labs/argocd-operator v0.18.0-rc1.0.20260520050648-ab2d14774530/go.mod h1:AlQPFgHsfi3ibtAuRvV2Gxn8rkFe9eunqzBb8AMS2nk= +github.com/argoproj/argo-cd/v3 v3.3.10 h1:3QE36lhN/0ntjwl2TH13xL23w2J2AaXgC0Dxn0469h4= +github.com/argoproj/argo-cd/v3 v3.3.10/go.mod h1:LdPjAnIFbx0khaB6vLsOKrGoSWeJ8kzOt//jF1ltCPg= github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d h1:iUJYrbSvpV9n8vyl1sBt1GceM60HhHfnHxuzcm5apDg= github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d/go.mod h1:PauXVUVcfiTgC+34lDdWzPS101g4NpsUtDAjFBnWf94= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q= @@ -453,16 +453,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= -go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms= -go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g= -go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g= -go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc= -go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8= -go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE= +go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= +go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= +go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= +go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= +go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8= go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew= -go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw= -go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= +go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= +go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= 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/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 5088deb2080..c5958fee3fb 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM quay.io/devtools_gitops/go-toolset:1.25.5 +FROM quay.io/devtools_gitops/go-toolset:1.25.9 USER root ARG KUBECTL_KUTTL_VERSION=0.12.1 diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index 4705ff932b8..29c953733a2 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -96,13 +96,13 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // when running against openshift-ci expected_dexVersion = "v2.43.0" expected_redisVersion = "8.2.3" - expected_argocdVersion = "v3.3.2" + expected_argocdVersion = "v3.3.10" } else { // when running against RC/ released version of gitops expected_dexVersion = "v2.43.1" expected_redisVersion = "7.2.11" - expected_argocdVersion = "v3.3.9" + expected_argocdVersion = "v3.3.10" } By("locating pods containing toolchain in openshift-gitops")