Align third-party versions with calico-private release-calient-v3.22 - #5178
Merged
rene-dekker merged 1 commit intoAug 14, 2026
Merged
Conversation
This branch tracks calico-private release-calient-v3.22 (see config/enterprise_versions.yml libcalico-go), which is bumping its third-party pins in tigera/calico-private#13238 and its Go/k8s pins in tigera/calico-private#13255. The operator deploys those images, so its own pins have to move with them. | pin | before | after | source | |---|---|---|---| | eck-kibana | 8.19.19 | 8.19.20 | #13238 | | eck-elasticsearch | 8.19.19 | 8.19.20 | #13238 | | coreos-prometheus | v3.12.0 | v3.13.2 | #13238 | | coreos-alertmanager | v0.32.1 | v0.33.1 | #13238 | | ISTIO_VERSION | 1.29.2 | 1.29.6 | #13238 | | GO_VERSION | 1.25.12 | 1.25.13 | #13255 | | api/go.mod go directive | 1.25.12 | 1.25.13 | #13255 | GO_BUILD_VER is composed from GO_VERSION/LLVM_VERSION/K8S_VERSION, so it becomes 1.25.13-llvm18.1.8-k8s1.35.7 — the same build image calico-private v3.22 moves to in #13255. That image is published. pkg/components/enterprise.go is regenerated from the yaml by gen-versions, not hand-edited. Already aligned, so not touched: K8S_VERSION is v1.35.7 and eck-elasticsearch-operator is 3.4.1, which is what v3.22 already targets. The api/go.mod directive is normally owned by its own Renovate rule (365268f bumped it to 1.25.12 separately from the GO_VERSION bump). It is included here so the two do not disagree on the same branch; drop it if you would rather let Renovate carry it. Verified: - go build ./... passes on calico/go-build:1.25.13-llvm18.1.8-k8s1.35.7. - Istio charts re-fetched at 1.29.6; pkg/render/istio passes. - pkg/render/logstorage/... (elasticsearch, kibana, eck) and pkg/components all pass.
Contributor
There was a problem hiding this comment.
Pull request overview
Aligns the operator’s pinned third-party component versions and build/tooling versions with the upstream calico-private release-calient-v3.22 branch, preventing the operator from deploying image versions that are no longer built.
Changes:
- Bump ECK Kibana/Elasticsearch pins to 8.19.20 and CoreOS Prometheus/Alertmanager pins to v3.13.2 / v0.33.1.
- Update build-time pins in the Makefile:
GO_VERSIONto 1.25.13 andISTIO_VERSIONto 1.29.6. - Keep the API submodule’s
godirective aligned with the Makefile Go version (1.25.13).
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| pkg/components/enterprise.go | Updates generated component version constants to match the enterprise versions config. |
| Makefile | Bumps Go build image Go version pin and Istio chart version pin. |
| config/enterprise_versions.yml | Updates enterprise third-party version pins that drive generated component versions. |
| api/go.mod | Updates the API submodule’s go directive to align with the updated Go pin. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
dimitri-nicolo
added
dependencies
rene-dekker
approved these changes
Aug 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Moves this branch's third-party pins to match calico-private
release-calient-v3.22, which is bumping them in tigera/calico-private#13238 (components) and #13255 (Go/k8s).This branch tracks
release-calient-v3.22(config/enterprise_versions.yml→libcalico-go), and the operator deploys those images, so its pins have to move with calico's or it will deploy versions that no longer get built.eck-kibanaeck-elasticsearchcoreos-prometheuscoreos-alertmanagerISTIO_VERSION(Makefile)GO_VERSION(Makefile)api/go.modgo directiveGO_BUILD_VERis composed fromGO_VERSION/LLVM_VERSION/K8S_VERSION, so it becomes 1.25.13-llvm18.1.8-k8s1.35.7 — byte-for-byte the build image calico-private v3.22 moves to in #13255. That tag is published; I built against it.pkg/components/enterprise.gois regenerated from the yaml bygen-versions— not hand-edited — sovalidate-gen-versionsstays clean.Already aligned, so untouched
K8S_VERSIONis alreadyv1.35.7, which is exactly what #13255 moves v3.22 to.eck-elasticsearch-operatoris already3.4.1, matching v3.22, and this branch'spkg/crds/enterprise/01-crd-eck-bundle.yamlis already the 3.4.1 bundle. (The v1.42 companion needs that bump; this branch doesn't.)One judgement call
The
api/go.modgo directive is normally owned by its own Renovate rule —365268f8bbumped it to 1.25.12 separately from theGO_VERSIONbump, so the two are tracked independently even though they currently agree. I've included it so they don't disagree on the branch after this PR, but it's the one line here that Renovate would otherwise carry on its own. Happy to drop it if you'd rather avoid the overlap.Note this only changes the api submodule's language version; the main module stays at
go 1.26.5and the binary still compiles with Go 1.26.5 via the branch'sGOTOOLCHAIN=go1.26.4+auto, unchanged by this PR.Verified
go build ./...passes oncalico/go-build:1.25.13-llvm18.1.8-k8s1.35.7.pkg/render/istiopasses (no golden fixtures are pinned to the chart version).pkg/render/logstorage/...(elasticsearch, kibana, eck, esgateway, esmetrics, linseed, dashboards) andpkg/componentsall pass.Companion PR
release-calient-v3.23. It deliberately does not take v3.23's Go 1.25.13, because that branch is on the Go 1.26 line.Release Note