diff --git a/.github/workflows/cloudevents-integration.yml b/.github/workflows/cloudevents-integration.yml index addc21c2f..0b7d8e1a3 100644 --- a/.github/workflows/cloudevents-integration.yml +++ b/.github/workflows/cloudevents-integration.yml @@ -12,7 +12,7 @@ on: - release-* env: - GO_VERSION: '1.24' + GO_VERSION: '1.25' GO_REQUIRED_MIN_VERSION: '' permissions: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index c1e0e0a96..e462853bc 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -15,7 +15,7 @@ on: - release-* env: - GO_VERSION: '1.24' + GO_VERSION: '1.25' GO_REQUIRED_MIN_VERSION: '' USE_EXISTING_CLUSTER: false # set to true to use an existing kind cluster for debugging with act diff --git a/.github/workflows/post.yml b/.github/workflows/post.yml index 80adf2d45..680a40bf1 100644 --- a/.github/workflows/post.yml +++ b/.github/workflows/post.yml @@ -13,7 +13,7 @@ on: env: # Common versions - GO_VERSION: '1.24' + GO_VERSION: '1.25' GO_REQUIRED_MIN_VERSION: '' permissions: diff --git a/.github/workflows/pre.yml b/.github/workflows/pre.yml index c4a365a44..2f5c1ff33 100644 --- a/.github/workflows/pre.yml +++ b/.github/workflows/pre.yml @@ -13,7 +13,7 @@ on: - release-* env: - GO_VERSION: '1.24' + GO_VERSION: '1.25' GO_REQUIRED_MIN_VERSION: '' permissions: diff --git a/.github/workflows/releaseimage.yml b/.github/workflows/releaseimage.yml index 84a8a6ae8..40d0c280f 100644 --- a/.github/workflows/releaseimage.yml +++ b/.github/workflows/releaseimage.yml @@ -6,7 +6,7 @@ on: - 'v*.*.*' env: # Common versions - GO_VERSION: '1.24' + GO_VERSION: '1.25' GO_REQUIRED_MIN_VERSION: '' GOPATH: '/home/runner/work/ocm/ocm/go' GITHUB_REF: ${{ github.ref }} diff --git a/build/Dockerfile.addon b/build/Dockerfile.addon index 52ef0b014..ec52c3815 100644 --- a/build/Dockerfile.addon +++ b/build/Dockerfile.addon @@ -1,4 +1,4 @@ -FROM golang:1.24-bullseye AS builder +FROM golang:1.25-bookworm AS builder ARG OS=linux ARG ARCH=amd64 WORKDIR /go/src/open-cluster-management.io/ocm diff --git a/build/Dockerfile.placement b/build/Dockerfile.placement index 314681fe2..7f1fe23c2 100644 --- a/build/Dockerfile.placement +++ b/build/Dockerfile.placement @@ -1,4 +1,4 @@ -FROM golang:1.24-bullseye AS builder +FROM golang:1.25-bookworm AS builder ARG OS=linux ARG ARCH=amd64 WORKDIR /go/src/open-cluster-management.io/ocm diff --git a/build/Dockerfile.registration b/build/Dockerfile.registration index 01a004aa9..4e9bc3165 100644 --- a/build/Dockerfile.registration +++ b/build/Dockerfile.registration @@ -1,4 +1,4 @@ -FROM golang:1.24-bullseye AS builder +FROM golang:1.25-bookworm AS builder ARG OS=linux ARG ARCH=amd64 WORKDIR /go/src/open-cluster-management.io/ocm diff --git a/build/Dockerfile.registration-operator b/build/Dockerfile.registration-operator index 5305f58b6..6ebdb2f25 100644 --- a/build/Dockerfile.registration-operator +++ b/build/Dockerfile.registration-operator @@ -1,4 +1,4 @@ -FROM golang:1.24-bullseye AS builder +FROM golang:1.25-bookworm AS builder ARG OS=linux ARG ARCH=amd64 WORKDIR /go/src/open-cluster-management.io/ocm diff --git a/build/Dockerfile.work b/build/Dockerfile.work index e156b57e8..b6fd8d527 100644 --- a/build/Dockerfile.work +++ b/build/Dockerfile.work @@ -1,4 +1,4 @@ -FROM golang:1.24-bullseye AS builder +FROM golang:1.25-bookworm AS builder ARG OS=linux ARG ARCH=amd64 WORKDIR /go/src/open-cluster-management.io/ocm diff --git a/deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml b/deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml index 8c811d78f..51a6f067a 100644 --- a/deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml +++ b/deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml @@ -59,7 +59,7 @@ metadata: categories: Integration & Delivery,OpenShift Optional certified: "false" containerImage: quay.io/open-cluster-management/registration-operator:latest - createdAt: "2025-12-15T05:30:24Z" + createdAt: "2025-12-16T09:07:02Z" description: Manages the installation and upgrade of the ClusterManager. operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 diff --git a/deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml b/deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml index 7dce929e5..c9ecbd779 100644 --- a/deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml +++ b/deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml @@ -31,7 +31,7 @@ metadata: categories: Integration & Delivery,OpenShift Optional certified: "false" containerImage: quay.io/open-cluster-management/registration-operator:latest - createdAt: "2025-12-15T05:30:24Z" + createdAt: "2025-12-16T09:07:02Z" description: Manages the installation and upgrade of the Klusterlet. operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 diff --git a/development.md b/development.md index f87a52113..a7245367f 100644 --- a/development.md +++ b/development.md @@ -26,7 +26,7 @@ Open Cluster Management (OCM) is a CNCF sandbox project that provides multiclust ### Key Technologies -- **Language**: Go 1.24.0 +- **Language**: Go 1.25.0 - **Framework**: Kubernetes operators with controller-runtime - **Build System**: Make with OpenShift build machinery - **Testing**: Ginkgo/Gomega for BDD-style tests @@ -36,7 +36,7 @@ Open Cluster Management (OCM) is a CNCF sandbox project that provides multiclust ### Prerequisites -- Go 1.24.0 ([installation guide](https://go.dev/doc/install)) +- Go 1.25.0 ([installation guide](https://go.dev/doc/install)) - Docker or Podman (container engine) - [Kind](https://kind.sigs.k8s.io/) (local Kubernetes clusters) - [kubectl](https://kubernetes.io/docs/tasks/tools/) (Kubernetes CLI) diff --git a/go.mod b/go.mod index ca8737dd9..71e6aa5e9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module open-cluster-management.io/ocm -go 1.24.0 +go 1.25.0 require ( github.com/aws/aws-sdk-go-v2 v1.41.0 @@ -39,9 +39,9 @@ require ( k8s.io/kube-aggregator v0.34.3 k8s.io/kubectl v0.34.3 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 - open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322 - open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c - open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1 + open-cluster-management.io/addon-framework v1.1.1-0.20251216020304-d6b232cac146 + open-cluster-management.io/api v1.1.1-0.20251216020302-b4274bb2f05a + open-cluster-management.io/sdk-go v1.1.1-0.20251215134527-7e7c96bed093 sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03 sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848 sigs.k8s.io/controller-runtime v0.22.4 diff --git a/go.sum b/go.sum index 67b286812..1c448e5d4 100644 --- a/go.sum +++ b/go.sum @@ -588,12 +588,12 @@ k8s.io/kubectl v0.34.3 h1:vpM6//153gh5gvsYHXWHVJ4l4xmN5QFwTSmlfd8icm8= k8s.io/kubectl v0.34.3/go.mod h1:zZQHtIZoUqTP1bAnPzq/3W1jfc0NeOeunFgcswrfg1c= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322 h1:ibdBTpWmpQ37f1jZgR3fFIDK5uDTOJRvOkDKnRjLOpg= -open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322/go.mod h1:YqG/M9aLM/jhUXZDb2lEi2gGFU8NHAPTsQEFGk/tiS8= -open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c h1:LWZ+5dwVSNVM84eMBiQkygyYIlAudXSwQ6IM5LXr7QY= -open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c/go.mod h1:Hk/3c114t6Ba5qhpqw+RoA93yEbE2CosG+JzzBZ6aCo= -open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1 h1:if168++xGJnZywbqYRYDhWTz5kCp2HpBQ59KmRX9Ag4= -open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1/go.mod h1:Hp1DYO2ABl/jt35Aw2IoeuJuvvURWXj1z2Gc8fdIVTw= +open-cluster-management.io/addon-framework v1.1.1-0.20251216020304-d6b232cac146 h1:9xiXnY0PHi8bWaxUqxML7BUvHmcLEBaAMIHagrhckj8= +open-cluster-management.io/addon-framework v1.1.1-0.20251216020304-d6b232cac146/go.mod h1:RB8Dni4wwJ3Kvpd083/Qfd/whbf4CZFqB9LPYGeF9Uc= +open-cluster-management.io/api v1.1.1-0.20251216020302-b4274bb2f05a h1:A8CSY1atudEbmjdEhdYUUQcN/Gdywo786WPPt0mFWgE= +open-cluster-management.io/api v1.1.1-0.20251216020302-b4274bb2f05a/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4= +open-cluster-management.io/sdk-go v1.1.1-0.20251215134527-7e7c96bed093 h1:waSj2qDeb2YkNxizfOYZE87fCtDtDpednD+LkR4kGIU= +open-cluster-management.io/sdk-go v1.1.1-0.20251215134527-7e7c96bed093/go.mod h1:3xQf3gISaZ3377vFnwjH3QH8EF2UNaf8D9igLPUBChk= sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03 h1:1ShFiMjGQOR/8jTBkmZrk1gORxnvMwm1nOy2/DbHg4U= sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03/go.mod h1:F1pT4mK53U6F16/zuaPSYpBaR7x5Kjym6aKJJC0/DHU= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= diff --git a/vendor/modules.txt b/vendor/modules.txt index cf1ac3443..b9c0359e8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1872,8 +1872,8 @@ k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322 -## explicit; go 1.24.0 +# open-cluster-management.io/addon-framework v1.1.1-0.20251216020304-d6b232cac146 +## explicit; go 1.25.0 open-cluster-management.io/addon-framework/pkg/addonfactory open-cluster-management.io/addon-framework/pkg/addonmanager open-cluster-management.io/addon-framework/pkg/addonmanager/addontesting @@ -1888,8 +1888,8 @@ open-cluster-management.io/addon-framework/pkg/agent open-cluster-management.io/addon-framework/pkg/assets open-cluster-management.io/addon-framework/pkg/index open-cluster-management.io/addon-framework/pkg/utils -# open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c -## explicit; go 1.24.0 +# open-cluster-management.io/api v1.1.1-0.20251216020302-b4274bb2f05a +## explicit; go 1.25.0 open-cluster-management.io/api/addon/v1alpha1 open-cluster-management.io/api/addon/v1beta1 open-cluster-management.io/api/client/addon/clientset/versioned @@ -1961,8 +1961,8 @@ open-cluster-management.io/api/operator/v1 open-cluster-management.io/api/utils/work/v1/workapplier open-cluster-management.io/api/work/v1 open-cluster-management.io/api/work/v1alpha1 -# open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1 -## explicit; go 1.24.0 +# open-cluster-management.io/sdk-go v1.1.1-0.20251215134527-7e7c96bed093 +## explicit; go 1.25.0 open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1 open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1 open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta2