Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO-CHERRYPICK] Upgrade cert-manager to 1.12.13 to get upstream patches for CVE-2024-25620 and CVE-2024-26147 - branch 3.0-dev #10478

Open
wants to merge 3 commits into
base: 3.0-dev
Choose a base branch
from
Open
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
110 changes: 0 additions & 110 deletions SPECS/cert-manager/CVE-2024-25620.patch

This file was deleted.

80 changes: 0 additions & 80 deletions SPECS/cert-manager/CVE-2024-6104.patch

This file was deleted.

6 changes: 3 additions & 3 deletions SPECS/cert-manager/cert-manager.signatures.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Signatures": {
"cert-manager-1.12.12-vendor.tar.gz": "eb2c70859fb2b73880f682e0c69eaeeec523481f94386b7d0150440799d7eecc",
"cert-manager-1.12.12.tar.gz": "2bdcc466ed77457616ea8732d002c4985524998da2c3dcc579d6e8f2af708484"
"cert-manager-1.12.13-vendor.tar.gz": "18894907e56205351f148a1aae828db6752d1189557d618720d782295abe4f84",
"cert-manager-1.12.13.tar.gz": "1bd650f7d066f98e2566397787caf938737c64ef4ab41284246acaffcdac7eb1"
}
}
}
12 changes: 4 additions & 8 deletions SPECS/cert-manager/cert-manager.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Automatically provision and manage TLS certificates in Kubernetes
Name: cert-manager
Version: 1.12.12
Release: 3%{?dist}
Version: 1.12.13
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -13,8 +13,6 @@ Source0: https://github.com/jetstack/%{name}/archive/refs/tags/v%{version
# 1. wget https://github.com/jetstack/%%{name}/archive/refs/tags/v%%{version}.tar.gz -O %%{name}-%%{version}.tar.gz
# 2. <repo-root>/SPECS/cert-manager/generate_source_tarball.sh --srcTarball %%{name}-%%{version}.tar.gz --pkgVersion %%{version}
Source1: %{name}-%{version}-vendor.tar.gz
Patch0: CVE-2024-25620.patch
Patch1: CVE-2024-6104.patch
Comment on lines -16 to -17
Copy link
Contributor

@PawelWMS PawelWMS Sep 18, 2024

Choose a reason for hiding this comment

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

Removing patches - fixe is already part of the 1.12.13 version.

BuildRequires: golang
Requires: %{name}-acmesolver
Requires: %{name}-cainjector
Expand Down Expand Up @@ -60,8 +58,6 @@ Webhook component providing API validation, mutation and conversion functionalit

%prep
%setup -q -a 1
%autopatch -p1


%build

Expand Down Expand Up @@ -107,8 +103,8 @@ install -D -m0755 bin/webhook %{buildroot}%{_bindir}/
%{_bindir}/webhook

%changelog
* Thu Aug 01 2024 Bala <balakumaran.kannan@microsoft.com> - 1.12.12-3
- Patch for CVE-2024-6104
* Mon Sep 16 2024 Jiri Appl <jiria@microsoft.com> - 1.12.13-1
- Upgrade to 1.12.13 which carries helm 3.14.2 to fix CVE-2024-26147 and CVE-2024-25620

* Wed Aug 07 2024 Bhagyashri Pathak <[email protected]> - 1.12.12-2
- Patch for CVE-2024-25620
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1547,8 +1547,8 @@
"type": "other",
"other": {
"name": "cert-manager",
"version": "1.12.12",
"downloadUrl": "https://github.com/jetstack/cert-manager/archive/refs/tags/v1.12.12.tar.gz"
"version": "1.12.13",
"downloadUrl": "https://github.com/jetstack/cert-manager/archive/refs/tags/v1.12.13.tar.gz"
}
}
},
Expand Down
Loading