Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.24 AS builder
FROM golang:1.25 AS builder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Go 1.25 upgrade is compatible; verify environment-specific changes.

The golang base image upgrade from 1.24 to 1.25 is a standard minor version bump. Ensure your build environment meets the macOS 12 Monterey or later requirement if applicable. The upgrade includes updated GOMAXPROCS behavior in containerized environments—verify this aligns with your deployment setup.

🤖 Prompt for AI Agents
Dockerfile lines 2-2: base image was bumped to golang:1.25; confirm and adjust
environment constraints and runtime settings to accommodate this minor Go
upgrade. Verify CI and any developer macOS hosts meet macOS Monterey (12) or
later requirements if using local macOS toolchains; run full build/test matrix
in CI (linux/macos/arm64/x86_64) to catch platform issues. Check containerized
GOMAXPROCS behavior changes by explicitly setting GOMAXPROCS (via ENV GOMAXPROCS
or runtime configuration) or relying on GOTRACEBACK/GODEBUG settings as
appropriate for your deployment, and update any docs/README and deployment
manifests to reflect the new Go version and required environment constraints.


WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.17.0
VERSION ?= 0.18.0

# Try to detect Docker or Podman
CONTAINER_RUNTIME := $(shell command -v docker 2> /dev/null || command -v podman 2> /dev/null)
Expand Down
4 changes: 2 additions & 2 deletions build/util/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Argo CD v3.1.9
FROM quay.io/argoproj/argocd@sha256:9c33285c0b86a66e9cf9fcafc448e48e0ab7c4678b20b3723556bb6cce8ea0b9 as argocd
# Argo CD v3.2.1
FROM quay.io/argoproj/argocd@sha256:a8532a23ed5f6e65afaf2a082b65fc74614549e54774f6b25fe3c993faa7bea3 as argocd

# Final Image
FROM docker.io/library/ubuntu:24.04
Expand Down
8 changes: 4 additions & 4 deletions bundle/manifests/argocd-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,13 @@ metadata:
capabilities: Deep Insights
categories: Integration & Delivery
certified: "false"
createdAt: "2025-11-04T23:03:04Z"
createdAt: "2025-12-17T12:19:06Z"
description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
operators.operatorframework.io/builder: operator-sdk-v1.35.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
repository: https://github.com/argoproj-labs/argocd-operator
support: Argo CD
name: argocd-operator.v0.17.0
name: argocd-operator.v0.18.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1937,7 +1937,7 @@ spec:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: ENABLE_CONVERSION_WEBHOOK
value: "true"
image: quay.io/argoprojlabs/argocd-operator:v0.17.0
image: quay.io/argoprojlabs/argocd-operator:v0.18.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -2030,7 +2030,7 @@ spec:
provider:
name: Argo CD Community
replaces: argocd-operator.v0.16.0
version: 0.17.0
version: 0.18.0
webhookdefinitions:
- admissionReviewVersions:
- v1alpha1
Expand Down
43 changes: 34 additions & 9 deletions bundle/manifests/argoproj.io_applications.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ spec:
a failed sync. If set to 0, no retries will be performed.
format: int64
type: integer
refresh:
description: 'Refresh indicates if the latest revision should
be used on retry instead of the initial one (default: false)'
type: boolean
type: object
sync:
description: Sync contains parameters for the operation
Expand Down Expand Up @@ -1475,11 +1479,15 @@ spec:
path:
description: |-
Path is a directory path within the git repository where hydrated manifests should be committed to and synced
from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced.
from. The Path should never point to the root of the repo. If hydrateTo is set, this is just the path from which
hydrated manifests will be synced.
minLength: 1
pattern: ^.{2,}|[^./]$
type: string
targetBranch:
description: TargetBranch is the branch to which hydrated
manifests should be committed
description: |-
TargetBranch is the branch from which hydrated manifests will be synced.
If HydrateTo is not set, this is also the branch to which hydrated manifests are committed.
type: string
required:
- path
Expand Down Expand Up @@ -1938,6 +1946,10 @@ spec:
a failed sync. If set to 0, no retries will be performed.
format: int64
type: integer
refresh:
description: 'Refresh indicates if the latest revision should
be used on retry instead of the initial one (default: false)'
type: boolean
type: object
syncOptions:
description: Options allow you to specify whole app sync-options
Expand Down Expand Up @@ -2906,6 +2918,11 @@ spec:
be performed.
format: int64
type: integer
refresh:
description: 'Refresh indicates if the latest revision
should be used on retry instead of the initial one (default:
false)'
type: boolean
type: object
sync:
description: Sync contains parameters for the operation
Expand Down Expand Up @@ -4878,11 +4895,15 @@ spec:
path:
description: |-
Path is a directory path within the git repository where hydrated manifests should be committed to and synced
from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced.
from. The Path should never point to the root of the repo. If hydrateTo is set, this is just the path from which
hydrated manifests will be synced.
minLength: 1
pattern: ^.{2,}|[^./]$
type: string
targetBranch:
description: TargetBranch is the branch to which hydrated
manifests should be committed
description: |-
TargetBranch is the branch from which hydrated manifests will be synced.
If HydrateTo is not set, this is also the branch to which hydrated manifests are committed.
type: string
required:
- path
Expand Down Expand Up @@ -4957,11 +4978,15 @@ spec:
path:
description: |-
Path is a directory path within the git repository where hydrated manifests should be committed to and synced
from. If hydrateTo is set, this is just the path from which hydrated manifests will be synced.
from. The Path should never point to the root of the repo. If hydrateTo is set, this is just the path from which
hydrated manifests will be synced.
minLength: 1
pattern: ^.{2,}|[^./]$
type: string
targetBranch:
description: TargetBranch is the branch to which hydrated
manifests should be committed
description: |-
TargetBranch is the branch from which hydrated manifests will be synced.
If HydrateTo is not set, this is also the branch to which hydrated manifests are committed.
type: string
required:
- path
Expand Down
Loading