From 2cbda90a2534b1932955e4ec37ac420d911fc7c8 Mon Sep 17 00:00:00 2001 From: Dimitri Nicolopoulos Date: Thu, 13 Aug 2026 16:50:55 -0700 Subject: [PATCH] Align third-party versions with calico-private release-calient-v3.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (365268f8b 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. --- Makefile | 4 ++-- api/go.mod | 2 +- config/enterprise_versions.yml | 8 ++++---- pkg/components/enterprise.go | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 0d4b20fa4f..86b563a54a 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ REPO?=tigera/operator PACKAGE_NAME?=github.com/tigera/operator LOCAL_USER_ID?=$(shell id -u $$USER) # The project Go version. -GO_VERSION?=1.25.12 +GO_VERSION?=1.25.13 # Version of Kubernetes to use for dependencies, tests, and kubectl. K8S_VERSION?=v1.35.7 # The version of LLVM to use for the go-build image. @@ -256,7 +256,7 @@ endif # To update the Istio version, see "Updating the bundled version of Istio" in docs/common_tasks.md. ISTIO_HELM_REPO ?= https://istio-release.storage.googleapis.com/charts -ISTIO_VERSION ?= 1.29.2 +ISTIO_VERSION ?= 1.29.6 ISTIO_RESOURCES_DIR = pkg/render/istio ISTIO_CHARTS = base istiod cni ztunnel ISTIO_CHART_FILES = $(addprefix $(ISTIO_RESOURCES_DIR)/,$(addsuffix .tgz,$(ISTIO_CHARTS))) diff --git a/api/go.mod b/api/go.mod index ebd2d6a3b4..d64c2ea7a7 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/tigera/operator/api -go 1.25.12 +go 1.25.13 require ( github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 diff --git a/config/enterprise_versions.yml b/config/enterprise_versions.yml index 23a3b8f80f..abe14d2d22 100644 --- a/config/enterprise_versions.yml +++ b/config/enterprise_versions.yml @@ -46,12 +46,12 @@ components: image: tigera/dex version: v3.22.6 eck-kibana: - version: 8.19.19 + version: 8.19.20 kibana: image: tigera/kibana version: v3.22.6 eck-elasticsearch: - version: 8.19.19 + version: 8.19.20 elasticsearch: image: tigera/elasticsearch version: v3.22.6 @@ -106,14 +106,14 @@ components: # coreos-prometheus holds the version of prometheus built for tigera/prometheus, # which prometheus operator uses to validate. coreos-prometheus: - version: v3.12.0 + version: v3.13.2 prometheus: image: tigera/prometheus version: v3.22.6 # coreos-prometheus holds the version of alertmanager built for tigera/alertmanager, # which prometheus operator uses to validate. coreos-alertmanager: - version: v0.32.1 + version: v0.33.1 alertmanager: image: tigera/alertmanager version: v3.22.6 diff --git a/pkg/components/enterprise.go b/pkg/components/enterprise.go index 18d9815027..a2e4826c3f 100644 --- a/pkg/components/enterprise.go +++ b/pkg/components/enterprise.go @@ -69,12 +69,12 @@ var ( } ComponentEckElasticsearch = Component{ - Version: "8.19.19", + Version: "8.19.20", Registry: "", } ComponentEckKibana = Component{ - Version: "8.19.19", + Version: "8.19.20", Registry: "", } @@ -228,7 +228,7 @@ var ( } ComponentCoreOSPrometheus = Component{ - Version: "v3.12.0", + Version: "v3.13.2", Registry: "", } @@ -245,7 +245,7 @@ var ( } ComponentCoreOSAlertmanager = Component{ - Version: "v0.32.1", + Version: "v0.33.1", Registry: "", }