From cc42388cb4f38d327c1b7825e357e6419339a039 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Fri, 28 Feb 2025 19:53:34 +0000
Subject: [PATCH 1/3] cloudnative-pg/1.25.1 package update

Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
---
 cloudnative-pg.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cloudnative-pg.yaml b/cloudnative-pg.yaml
index 8a3ea771290..8af52034f2a 100644
--- a/cloudnative-pg.yaml
+++ b/cloudnative-pg.yaml
@@ -1,7 +1,7 @@
 package:
   name: cloudnative-pg
-  version: 1.25.0
-  epoch: 2
+  version: "1.25.1"
+  epoch: 0
   description: CloudNativePG is a comprehensive platform designed to seamlessly manage PostgreSQL databases
   copyright:
     - license: Apache-2.0
@@ -11,16 +11,12 @@ pipeline:
     with:
       repository: https://github.com/cloudnative-pg/cloudnative-pg
       tag: v${{package.version}}
-      expected-commit: bad5a251642655399eca392abf5d981668fbd8cc
+      expected-commit: c56e00d462c3899ab305540953ec541dfe0f762a
 
   - name: Generate controller code
     runs: |
       make generate fmt vet
 
-  - uses: go/bump
-    with:
-      deps: golang.org/x/net@v0.33.0
-
   - uses: go/build
     with:
       output: manager_${{build.goarch}}

From f34811c9b153271159c0e55f896a479eed32c738 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@chainguard.dev>
Date: Mon, 3 Mar 2025 12:40:29 -0500
Subject: [PATCH 2/3] cloudnative-pg: place `manager_<ARCH>` in newly-expected
 path

Upstream moved their expected installation location to `/operator` in
https://github.com/cloudnative-pg/cloudnative-pg/commit/34ab236e0a442e7bd30b401257824926660d1ae3

We replicate this with a symlink, to avoid breaking any consumers (such
as our tests) which expect `manager_<ARCH>` to be in PATH.
---
 cloudnative-pg.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cloudnative-pg.yaml b/cloudnative-pg.yaml
index 8af52034f2a..ab80bad6299 100644
--- a/cloudnative-pg.yaml
+++ b/cloudnative-pg.yaml
@@ -27,7 +27,10 @@ pipeline:
         -X github.com/cloudnative-pg/cloudnative-pg/pkg/versions.buildDate=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%dT%H:%M:%SZ")
       packages: ./cmd/manager
 
-  - runs: ln -sf /bin/manager_${{build.goarch}} ${{targets.contextdir}}/manager
+  - runs: |
+      mkdir ${{targets.contextdir}}/operator
+      ln -sf /bin/manager_${{build.goarch}} ${{targets.contextdir}}/operator/
+      ln -sf /bin/manager_${{build.goarch}} ${{targets.contextdir}}/manager
 
 subpackages:
   - name: ${{package.name}}-plugins

From 246776ca9bcdfdd3ed6d6f853e425d9128429a65 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@chainguard.dev>
Date: Mon, 3 Mar 2025 12:43:47 -0500
Subject: [PATCH 3/3] cloudnative-pg: don't install into /bin

Upstream no longer expects the `manager_<ARCH>` binary to be in `/bin`
(the previous commit followed their new expectation of `/operator`), so
we can install into our standard prefix (avoiding any potential for
usrmerge issues).
---
 cloudnative-pg.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloudnative-pg.yaml b/cloudnative-pg.yaml
index ab80bad6299..f9f63080f0f 100644
--- a/cloudnative-pg.yaml
+++ b/cloudnative-pg.yaml
@@ -20,7 +20,6 @@ pipeline:
   - uses: go/build
     with:
       output: manager_${{build.goarch}}
-      prefix: /
       ldflags: |
         -X github.com/cloudnative-pg/cloudnative-pg/pkg/versions.buildVersion=${{package.version}}
         -X github.com/cloudnative-pg/cloudnative-pg/pkg/versions.buildCommit=$(git rev-parse --short=8 HEAD)
@@ -29,8 +28,8 @@ pipeline:
 
   - runs: |
       mkdir ${{targets.contextdir}}/operator
-      ln -sf /bin/manager_${{build.goarch}} ${{targets.contextdir}}/operator/
-      ln -sf /bin/manager_${{build.goarch}} ${{targets.contextdir}}/manager
+      ln -sf /usr/bin/manager_${{build.goarch}} ${{targets.contextdir}}/operator/
+      ln -sf /usr/bin/manager_${{build.goarch}} ${{targets.contextdir}}/manager
 
 subpackages:
   - name: ${{package.name}}-plugins