From 887a7db02aa0b47a3e7a668340b7da4cfe5acf1c Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 10 Jul 2024 14:58:41 +0200 Subject: [PATCH 1/8] new basic template --- veneer/everest-operator.yaml | 113 ++++++++++++++++------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/veneer/everest-operator.yaml b/veneer/everest-operator.yaml index ea9085a..4759b95 100644 --- a/veneer/everest-operator.yaml +++ b/veneer/everest-operator.yaml @@ -1,61 +1,54 @@ -defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -name: fast-v0 +schema: olm.template.basic entries: -- name: everest-operator.v0.0.0 -- name: everest-operator.v0.9.0 -- name: everest-operator.v0.9.1 -- name: everest-operator.v0.10.0 -- name: everest-operator.v0.10.1 -- name: everest-operator.v1.0.0 -- name: everest-operator.v1.0.1 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - - everest-operator.v0.10.0 - - everest-operator.v0.10.1 - - everest-operator.v1.0.0 -package: everest-operator -schema: olm.channel ---- -name: stable-v0 -entries: -- name: everest-operator.v0.9.0 -- name: everest-operator.v0.9.1 -- name: everest-operator.v0.10.0 -- name: everest-operator.v0.10.1 -- name: everest-operator.v1.0.0 -- name: everest-operator.v1.0.1 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - - everest-operator.v0.10.0 - - everest-operator.v0.10.1 - - everest-operator.v1.0.0 -package: everest-operator -schema: olm.channel ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.0.0 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.9.0 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.9.1 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.10.0 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.10.1 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:1.0.0 ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:1.0.1 +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + - name: everest-operator.v0.10.1 + - name: everest-operator.v1.0.0 + - name: everest-operator.v1.0.1 + replaces: everest-operator.v0.9.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + - everest-operator.v0.10.0 + - everest-operator.v0.10.1 + - everest-operator.v1.0.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + - name: everest-operator.v0.10.1 + - name: everest-operator.v1.0.0 + - name: everest-operator.v1.0.1 + skips: + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + - everest-operator.v0.10.0 + - everest-operator.v0.10.1 + - everest-operator.v1.0.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.1 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.1 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:1.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:1.0.1 From 2b120a5491237d5cc3075b93d54c371e629b4d8e Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Wed, 10 Jul 2024 15:30:19 +0200 Subject: [PATCH 2/8] update tests input and output to basic template --- tools/everest-operator_test.yaml | 74 +++--- tools/veneer-update_test.go | 432 +++++++++++++++---------------- 2 files changed, 242 insertions(+), 264 deletions(-) diff --git a/tools/everest-operator_test.yaml b/tools/everest-operator_test.yaml index 1260d96..c8c582c 100644 --- a/tools/everest-operator_test.yaml +++ b/tools/everest-operator_test.yaml @@ -1,39 +1,37 @@ -defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -name: fast-v0 +schema: olm.template.basic entries: -- name: everest-operator.v0.0.0 -- name: everest-operator.v0.9.0 -- name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -package: everest-operator -schema: olm.channel ---- -name: fast-v1 -entries: -- name: everest-operator.v0.0.0 -- name: everest-operator.v0.9.0 -- name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -package: everest-operator -schema: olm.channel ---- -name: stable-v0 -entries: -- name: everest-operator.v0.9.0 -- name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -package: everest-operator -schema: olm.channel ---- -schema: olm.bundle -image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 diff --git a/tools/veneer-update_test.go b/tools/veneer-update_test.go index 0ff4575..80158cb 100644 --- a/tools/veneer-update_test.go +++ b/tools/veneer-update_test.go @@ -91,243 +91,223 @@ func TestMinor(t *testing.T) { } } -var patchStableExpected = `defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- +var patchStableExpected = `schema: olm.template.basic entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.9.2 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 -name: fast-v0 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -name: fast-v1 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -name: stable-v0 -package: everest-operator -schema: olm.channel ---- -image: docker.io/perconalab/everest-operator-bundle:0.0.0 -schema: olm.bundle ---- -image: docker.io/perconalab/everest-operator-bundle:0.9.2 -schema: olm.bundle ---- +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.9.2 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.2 ` -var patchStableRCExpected = `defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.9.2-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 -name: fast-v0 -package: everest-operator -schema: olm.channel ---- +var patchStableRCExpected = `schema: olm.template.basic entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -name: fast-v1 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -name: stable-v0 -package: everest-operator -schema: olm.channel ---- -image: docker.io/perconalab/everest-operator-bundle:0.0.0 -schema: olm.bundle ---- -image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 -schema: olm.bundle ---- +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.9.2-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 ` -var patchRCExpected = `defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -name: fast-v0 -package: everest-operator -schema: olm.channel ---- +var patchRCExpected = `schema: olm.template.basic entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - - name: everest-operator.v0.9.1-rc2 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1-rc1 -name: fast-v1 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -name: stable-v0 -package: everest-operator -schema: olm.channel ---- -image: docker.io/perconalab/everest-operator-bundle:0.0.0 -schema: olm.bundle ---- -image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 -schema: olm.bundle ---- +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + - name: everest-operator.v0.9.1-rc2 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1-rc1 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 ` -var minorStableExpected = `defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - name: everest-operator.v0.10.0 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 -name: fast-v0 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -name: fast-v1 -package: everest-operator -schema: olm.channel ---- +var minorStableExpected = `schema: olm.template.basic entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -name: stable-v0 -package: everest-operator -schema: olm.channel ---- -image: docker.io/perconalab/everest-operator-bundle:0.0.0 -schema: olm.bundle ---- -image: docker.io/perconalab/everest-operator-bundle:0.10.0 -schema: olm.bundle ---- +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - name: everest-operator.v0.10.0 + replaces: everest-operator.v0.9.0 + skips: + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.0 ` -var minorStableRCExpected = `defaultChannel: stable-v0 -name: everest-operator -schema: olm.package ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - name: everest-operator.v0.10.0-rc1 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 -name: fast-v0 -package: everest-operator -schema: olm.channel ---- -entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 -name: fast-v1 -package: everest-operator -schema: olm.channel ---- +var minorStableRCExpected = `schema: olm.template.basic entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 -name: stable-v0 -package: everest-operator -schema: olm.channel ---- -image: docker.io/perconalab/everest-operator-bundle:0.0.0 -schema: olm.bundle ---- -image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 -schema: olm.bundle ---- +- schema: olm.package + defaultChannel: stable-v0 + name: everest-operator +- schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - name: everest-operator.v0.10.0-rc1 + replaces: everest-operator.v0.9.0 + skips: + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator +- schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 +- schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 ` From b3de0cd557920d423426920b1332943fc6b733ab Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Thu, 11 Jul 2024 14:09:02 +0200 Subject: [PATCH 3/8] update script & tests --- tools/everest-operator_test.yaml | 70 ++--- tools/veneer-update.go | 274 +++++------------ tools/veneer-update_test.go | 505 ++++++++++++++++--------------- veneer/everest-operator.yaml | 109 +++---- 4 files changed, 430 insertions(+), 528 deletions(-) diff --git a/tools/everest-operator_test.yaml b/tools/everest-operator_test.yaml index c8c582c..2b78961 100644 --- a/tools/everest-operator_test.yaml +++ b/tools/everest-operator_test.yaml @@ -1,37 +1,37 @@ schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 diff --git a/tools/veneer-update.go b/tools/veneer-update.go index b17d89c..784a6d8 100644 --- a/tools/veneer-update.go +++ b/tools/veneer-update.go @@ -1,23 +1,17 @@ package main import ( - "bytes" - "errors" "fmt" - "io" + "gopkg.in/yaml.v3" "os" "strings" goversion "github.com/hashicorp/go-version" "github.com/spf13/cobra" - "gopkg.in/yaml.v3" ) -const imageNameTemplate = "docker.io/perconalab/everest-operator-bundle:%s" - func main() { var ( - versionType string newVersion string currentVersion string channel string @@ -32,25 +26,16 @@ func main() { b []byte err error ) - switch strings.ToLower(versionType) { - case "minor": - b, err = createMinorVersionVeneer(veneerFile, channel, currentVersion, newVersion) - case "patch": - b, err = createPatchVersionVeneer(veneerFile, channel, currentVersion, newVersion) - default: - panic("version-type is required") - } + b, err = updateVeneer(veneerFile, channel, currentVersion, newVersion) if err != nil { panic(err) } - out := strings.TrimSuffix(string(b), "---\n") - fmt.Println(out) + fmt.Println(string(b)) }, } - rootCmd.Flags().StringVar(&versionType, "version-type", "", "New version type, either minor or patch") rootCmd.Flags().StringVar(&newVersion, "new-version", "", "New version (e.g. 0.10.0)") rootCmd.Flags().StringVar(¤tVersion, "current-version", "", "Current version (e.g. 0.9.5)") rootCmd.Flags().StringVar(&channel, "channel", "", "Channel to update (e.g. stable-v0)") @@ -61,215 +46,110 @@ func main() { } } -func createPatchVersionVeneer(veneerFile, channel, currentVersion, newVersion string) ([]byte, error) { - source, err := os.ReadFile(veneerFile) - if err != nil { - return nil, fmt.Errorf("could not read veneer file: %w", err) - } - - ret, err := updateVeneerFile(source, "olm.channel", "name", channel, func(m map[string]any) (map[string]any, error) { - entries, ok := m["entries"] - if !ok { - return nil, errors.New("could not find entries") - } - - eSlice, ok := entries.([]any) - if !ok { - return nil, errors.New("could not assert to slice") - } - - i, e, err := findEntry(eSlice, currentVersion) - if err != nil { - return nil, err - } - - // Keep just the name config in the current version - eSlice[i] = map[string]any{"name": e["name"]} - - // Create a copy of the current version and rename to new version - newEntry := e - newEntry["name"] = fmt.Sprintf("everest-operator.v%s", newVersion) +type Entry struct { + Schema string `yaml:"schema"` + DefaultChannel string `yaml:"defaultChannel,omitempty"` + Name string `yaml:"name,omitempty"` + Versions []Version `yaml:"entries,omitempty"` + Package string `yaml:"package,omitempty"` + Image string `yaml:"image,omitempty"` +} - // Add current version to skips - skips, ok := newEntry["skips"] - if !ok { - skips = []string{} - } +type Template struct { + Schema string `yaml:"schema"` + Entries []Entry `yaml:"entries"` +} - skipsSlice, ok := skips.([]any) - if !ok { - return nil, errors.New("could not assert skips to slice") - } +type Version struct { + Name string `yaml:"name"` + Replaces string `yaml:"replaces,omitempty"` + Skips []string `yaml:"skips,omitempty"` +} - newEntry["skips"] = append(skipsSlice, fmt.Sprintf("everest-operator.v%s", currentVersion)) +const ( + olmChannelSchema = "olm.channel" + olmBundleSchema = "olm.bundle" - eSlice = append(eSlice, newEntry) - m["entries"] = eSlice + versionPrefix = "everest-operator.v" - return m, nil - }) + rcBundle = "docker.io/perconalab/everest-operator-bundle:" + releaseBundle = "docker.io/percona/everest-operator-bundle:" +) +func updateVeneer(veneerFile, channel, currentVersionStr, newVersionStr string) ([]byte, error) { + release, err := validateVersion(currentVersionStr, newVersionStr) if err != nil { - return nil, err + return nil, fmt.Errorf("%s: invalid version format: %w", newVersionStr, err) } - return addOLMBundle(ret, newVersion) -} - -func createMinorVersionVeneer(veneerFile, channel, currentVersion, newVersion string) ([]byte, error) { source, err := os.ReadFile(veneerFile) if err != nil { return nil, fmt.Errorf("could not read veneer file: %w", err) } - ret, err := updateVeneerFile(source, "olm.channel", "name", channel, func(m map[string]any) (map[string]any, error) { - entries, ok := m["entries"] - if !ok { - return nil, errors.New("could not find entries") - } - - eSlice, ok := entries.([]any) - if !ok { - return nil, errors.New("could not assert to slice") - } - - v, err := goversion.NewVersion(currentVersion) - if err != nil { - return nil, errors.Join(err, errors.New("could not parse current version")) - } - - seg := v.Segments() - skips := make([]string, 0, 10) - for _, es := range eSlice { - e, ok := es.(map[string]any) - if !ok { - return nil, errors.New("could not assert to map") - } - - nameA, ok := e["name"] - if !ok { - continue - } - - name, ok := nameA.(string) - if !ok { - continue - } - - if strings.HasPrefix(name, fmt.Sprintf("everest-operator.v%d.%d.", seg[0], seg[1])) { - skips = append(skips, name) - } - } - - newEntry := map[string]any{ - "name": fmt.Sprintf("everest-operator.v%s", newVersion), - "replaces": fmt.Sprintf("everest-operator.v%d.%d.0", seg[0], seg[1]), - "skips": skips, - } - - m["entries"] = append(eSlice, newEntry) - - return m, nil - }) - + var template Template + err = yaml.Unmarshal(source, &template) if err != nil { + fmt.Println("Error unmarshalling YAML:", err) return nil, err } - return addOLMBundle(ret, newVersion) -} - -func findEntry(entries []any, version string) (int, map[string]any, error) { - for i, es := range entries { - e, ok := es.(map[string]any) - if !ok { - return 0, nil, errors.New("could not assert to map") - } - - // Find document by name - name, ok := e["name"] - if !ok { - continue - } - if name != fmt.Sprintf("everest-operator.v%s", version) { - continue + for i, schema := range template.Entries { + if schema.Schema == olmChannelSchema && schema.Name == channel { + if len(schema.Versions) == 0 { + return nil, fmt.Errorf("versions list is empty for %s channel", channel) + } + lastVersion := schema.Versions[len(schema.Versions)-1] + // new version inherits the replaces from the last version and adds a new skip to the skips + newVersion := Version{ + Name: versionPrefix + release.newVersion.String(), + Replaces: lastVersion.Replaces, + Skips: append(lastVersion.Skips, lastVersion.Name), + } + // the previous version shouldn't have any replaces and skips anymore + schema.Versions[len(schema.Versions)-1].Replaces = "" + schema.Versions[len(schema.Versions)-1].Skips = nil + // add the new version to the list of versions + schema.Versions = append(schema.Versions, newVersion) + template.Entries[i] = schema + break } - - return i, e, nil } - return 0, nil, errors.New("not found") + template.Entries = append(template.Entries, Entry{Schema: olmBundleSchema, Image: release.image()}) + return yaml.Marshal(template) } -func updateVeneerFile(veneerFile []byte, schema, fieldName, fieldValue string, replace func(map[string]any) (map[string]any, error)) ([]byte, error) { - d := yaml.NewDecoder(bytes.NewReader(veneerFile)) - docs := make([]map[string]any, 0, 10) - for { - var doc map[string]any - if err := d.Decode(&doc); err != nil { - if errors.Is(err, io.EOF) { - break - } - return nil, fmt.Errorf("could not decode yaml: %w", err) - } - - if s, ok := doc["schema"]; !ok || s != schema { - docs = append(docs, doc) - continue - } - - if f, ok := doc[fieldName]; !ok || f != fieldValue { - docs = append(docs, doc) - continue - } - - replacement, err := replace(doc) - if err != nil { - return nil, err - } - docs = append(docs, replacement) - } +type release struct { + isRC bool + newVersion goversion.Version + previousVersion goversion.Version +} - b := &bytes.Buffer{} - for _, d := range docs { - db, err := yaml.Marshal(d) - if err != nil { - return nil, fmt.Errorf("could not marshal yaml: %w", err) - } - if _, err := b.Write(db); err != nil { - return nil, fmt.Errorf("could not write yaml: %w", err) - } - if _, err := b.WriteString("---\n"); err != nil { - return nil, fmt.Errorf("could not write doc separator: %w", err) - } +func (r release) image() string { + version := r.newVersion.String() + if r.isRC { + return rcBundle + version } - - return b.Bytes(), nil + return releaseBundle + version } -func addOLMBundle(veneeerContents []byte, newVersion string) ([]byte, error) { - ret := veneeerContents - - var ( - foundImage bool - imageName = fmt.Sprintf(imageNameTemplate, newVersion) - ) - - _, err := updateVeneerFile(veneeerContents, "olm.bundle", "image", imageName, func(m map[string]any) (map[string]any, error) { - foundImage = true - return m, nil - }) +func validateVersion(currentVersionStr, newVersionStr string) (release, error) { + result := release{} + currentVersion, err := goversion.NewVersion(currentVersionStr) if err != nil { - return nil, errors.Join(err, errors.New("could not find olm.bundle")) + return result, fmt.Errorf("%s: can not parse current version: %w", currentVersionStr, err) } - if !foundImage { - ret = append(ret, []byte(fmt.Sprintf( - "image: %s\n"+ - "schema: olm.bundle\n"+ - "---\n", imageName, - ))...) + newVersion, err := goversion.NewVersion(newVersionStr) + if err != nil { + return result, fmt.Errorf("%s: can not parse new version: %w", newVersionStr, err) } - return ret, nil + if strings.Contains(newVersionStr, "rc") { + result.isRC = true + } + result.newVersion = *newVersion + result.previousVersion = *currentVersion + return result, nil } diff --git a/tools/veneer-update_test.go b/tools/veneer-update_test.go index 80158cb..ba31c9d 100644 --- a/tools/veneer-update_test.go +++ b/tools/veneer-update_test.go @@ -17,64 +17,46 @@ func TestPatch(t *testing.T) { expectedOutput string }{ { - name: "Stable patch version", + name: "Non-rc patch release", channel: "fast-v0", currentVersion: "0.9.1", newVersion: "0.9.2", - expectedOutput: patchStableExpected, + expectedOutput: NonRCPatchExpected, }, { - name: "RC patch version over stable", + name: "RC patch release over non-rc release", channel: "fast-v0", currentVersion: "0.9.1", newVersion: "0.9.2-rc1", - expectedOutput: patchStableRCExpected, + expectedOutput: rcPatchOverNonRCExpected, }, { name: "RC patch version over RC", channel: "fast-v1", currentVersion: "0.9.1-rc1", newVersion: "0.9.1-rc2", - expectedOutput: patchRCExpected, + expectedOutput: rcOverRcPatchExpected, }, - } - - for _, tt := range testcases { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - b, err := createPatchVersionVeneer( - "./everest-operator_test.yaml", tt.channel, tt.currentVersion, tt.newVersion, - ) - require.NoError(t, err) - require.Equal(t, tt.expectedOutput, string(b)) - }) - } -} - -func TestMinor(t *testing.T) { - t.Parallel() - - testcases := []struct { - name string - channel string - currentVersion string - newVersion string - expectedOutput string - }{ { - name: "Stable minor version", + name: "Non-RC minor release", channel: "fast-v0", currentVersion: "0.9.1", newVersion: "0.10.0", - expectedOutput: minorStableExpected, + expectedOutput: nonRCMinorExpected, }, { - name: "Stable minor RC version", + name: "Minor release's first RC", channel: "fast-v0", currentVersion: "0.9.1", newVersion: "0.10.0-rc1", - expectedOutput: minorStableRCExpected, + expectedOutput: minorReleasesFirstRCExpected, + }, + { + name: "Minor release stable channel", + channel: "stable-v0", + currentVersion: "0.9.1", + newVersion: "0.10.0", + expectedOutput: minorReleaseStableChannelExpected, }, } @@ -82,232 +64,267 @@ func TestMinor(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - b, err := createMinorVersionVeneer( - "./everest-operator_test.yaml", tt.channel, tt.currentVersion, tt.newVersion, - ) + b, err := updateVeneer("./everest-operator_test.yaml", tt.channel, tt.currentVersion, tt.newVersion) require.NoError(t, err) - require.Equal(t, tt.expectedOutput, string(b)) + actual := string(b) + require.Equal(t, tt.expectedOutput, actual) }) } } -var patchStableExpected = `schema: olm.template.basic +var NonRCPatchExpected = `schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.9.2 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.2 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.9.2 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/percona/everest-operator-bundle:0.9.2 ` -var patchStableRCExpected = `schema: olm.template.basic +var rcPatchOverNonRCExpected = `schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.9.2-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.9.2-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 ` -var patchRCExpected = `schema: olm.template.basic +var rcOverRcPatchExpected = `schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - - name: everest-operator.v0.9.1-rc2 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1-rc1 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + - name: everest-operator.v0.9.1-rc2 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1-rc1 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 ` -var minorStableExpected = `schema: olm.template.basic +var nonRCMinorExpected = `schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - name: everest-operator.v0.10.0 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.0 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/percona/everest-operator-bundle:0.10.0 ` -var minorStableRCExpected = `schema: olm.template.basic +var minorReleasesFirstRCExpected = `schema: olm.template.basic +entries: + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + skips: + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 +` +var minorReleaseStableChannelExpected = `schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - name: everest-operator.v0.10.0-rc1 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - package: everest-operator -- schema: olm.channel - name: fast-v1 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1-rc1 - replaces: everest-operator.v0.0.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - skips: - - everest-operator.v0.9.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: fast-v1 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1-rc1 + replaces: everest-operator.v0.0.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + skips: + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/percona/everest-operator-bundle:0.10.0 ` diff --git a/veneer/everest-operator.yaml b/veneer/everest-operator.yaml index 4759b95..9540109 100644 --- a/veneer/everest-operator.yaml +++ b/veneer/everest-operator.yaml @@ -1,54 +1,59 @@ schema: olm.template.basic entries: -- schema: olm.package - defaultChannel: stable-v0 - name: everest-operator -- schema: olm.channel - name: fast-v0 - entries: - - name: everest-operator.v0.0.0 - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.10.0 - - name: everest-operator.v0.10.1 - - name: everest-operator.v1.0.0 - - name: everest-operator.v1.0.1 - replaces: everest-operator.v0.9.0 - skips: - - everest-operator.v0.0.0 - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - - everest-operator.v0.10.0 - - everest-operator.v0.10.1 - - everest-operator.v1.0.0 - package: everest-operator -- schema: olm.channel - name: stable-v0 - entries: - - name: everest-operator.v0.9.0 - - name: everest-operator.v0.9.1 - - name: everest-operator.v0.10.0 - - name: everest-operator.v0.10.1 - - name: everest-operator.v1.0.0 - - name: everest-operator.v1.0.1 - skips: - - everest-operator.v0.9.0 - - everest-operator.v0.9.1 - - everest-operator.v0.10.0 - - everest-operator.v0.10.1 - - everest-operator.v1.0.0 - package: everest-operator -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.1 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.1 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:1.0.0 -- schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:1.0.1 + - schema: olm.package + defaultChannel: stable-v0 + name: everest-operator + - schema: olm.channel + name: fast-v0 + entries: + - name: everest-operator.v0.0.0 + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + - name: everest-operator.v0.10.1 + - name: everest-operator.v1.0.0 + - name: everest-operator.v1.0.1 + - name: everest-operator.v1.0.2 + replaces: everest-operator.v0.9.0 + skips: + - everest-operator.v0.0.0 + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + - everest-operator.v0.10.0 + - everest-operator.v0.10.1 + - everest-operator.v1.0.0 + - everest-operator.v1.0.1 + package: everest-operator + - schema: olm.channel + name: stable-v0 + entries: + - name: everest-operator.v0.9.0 + - name: everest-operator.v0.9.1 + - name: everest-operator.v0.10.0 + - name: everest-operator.v0.10.1 + - name: everest-operator.v1.0.0 + - name: everest-operator.v1.0.1 + skips: + - everest-operator.v0.9.0 + - everest-operator.v0.9.1 + - everest-operator.v0.10.0 + - everest-operator.v0.10.1 + - everest-operator.v1.0.0 + package: everest-operator + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.0.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.9.1 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:0.10.1 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:1.0.0 + - schema: olm.bundle + image: docker.io/perconalab/everest-operator-bundle:1.0.1 + - schema: olm.bundle + image: docker.io/percona/everest-operator-bundle:1.0.2 + From 1b8ec3effde5c248a087d3a4868b58aee3cfad49 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Thu, 11 Jul 2024 14:18:23 +0200 Subject: [PATCH 4/8] remove tmp test data --- veneer/everest-operator.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/veneer/everest-operator.yaml b/veneer/everest-operator.yaml index 9540109..4967964 100644 --- a/veneer/everest-operator.yaml +++ b/veneer/everest-operator.yaml @@ -13,7 +13,6 @@ entries: - name: everest-operator.v0.10.1 - name: everest-operator.v1.0.0 - name: everest-operator.v1.0.1 - - name: everest-operator.v1.0.2 replaces: everest-operator.v0.9.0 skips: - everest-operator.v0.0.0 @@ -22,7 +21,6 @@ entries: - everest-operator.v0.10.0 - everest-operator.v0.10.1 - everest-operator.v1.0.0 - - everest-operator.v1.0.1 package: everest-operator - schema: olm.channel name: stable-v0 @@ -54,6 +52,5 @@ entries: image: docker.io/perconalab/everest-operator-bundle:1.0.0 - schema: olm.bundle image: docker.io/perconalab/everest-operator-bundle:1.0.1 - - schema: olm.bundle - image: docker.io/percona/everest-operator-bundle:1.0.2 + From 202e46334f3206d722949634151c13a71422107e Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 12 Jul 2024 10:27:10 +0200 Subject: [PATCH 5/8] veneer new format --- veneer/everest-operator.yaml | 47 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/veneer/everest-operator.yaml b/veneer/everest-operator.yaml index 4967964..d5a88ce 100644 --- a/veneer/everest-operator.yaml +++ b/veneer/everest-operator.yaml @@ -1,11 +1,8 @@ -schema: olm.template.basic entries: - - schema: olm.package - defaultChannel: stable-v0 + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -21,10 +18,10 @@ entries: - everest-operator.v0.10.0 - everest-operator.v0.10.1 - everest-operator.v1.0.0 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 - name: everest-operator.v0.10.0 @@ -37,20 +34,22 @@ entries: - everest-operator.v0.10.0 - everest-operator.v0.10.1 - everest-operator.v1.0.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.1 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.1 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:1.0.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:1.0.1 - + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.10.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.10.1 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.9.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.9.1 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:1.0.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:1.0.1 + schema: olm.bundle +schema: olm.template.basic From f8142bf15642e2f6337f8619b8c2a4430550886f Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 12 Jul 2024 11:55:21 +0200 Subject: [PATCH 6/8] use basic.BasicTemplate, change yaml to alphabetic order --- tools/everest-operator_test.yaml | 28 +- tools/everest_basic_template.go | 94 ++++++ tools/go.mod | 139 +++++++++ tools/go.sum | 485 +++++++++++++++++++++++++++++++ tools/release.go | 61 ++++ tools/veneer-update.go | 108 +------ tools/veneer-update_test.go | 207 ++++++------- 7 files changed, 905 insertions(+), 217 deletions(-) create mode 100644 tools/everest_basic_template.go create mode 100644 tools/go.mod create mode 100644 tools/go.sum create mode 100644 tools/release.go diff --git a/tools/everest-operator_test.yaml b/tools/everest-operator_test.yaml index 2b78961..58c9e74 100644 --- a/tools/everest-operator_test.yaml +++ b/tools/everest-operator_test.yaml @@ -1,11 +1,8 @@ -schema: olm.template.basic entries: - - schema: olm.package - defaultChannel: stable-v0 + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -13,10 +10,10 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -24,14 +21,17 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle +schema: olm.template.basic diff --git a/tools/everest_basic_template.go b/tools/everest_basic_template.go new file mode 100644 index 0000000..1b9bacd --- /dev/null +++ b/tools/everest_basic_template.go @@ -0,0 +1,94 @@ +package main + +import ( + "encoding/json" + "fmt" + "github.com/operator-framework/operator-registry/alpha/declcfg" + "github.com/operator-framework/operator-registry/alpha/template/basic" + "gopkg.in/yaml.v3" + "os" +) + +const versionPrefix = "everest-operator.v" + +type EverestBasicTemplate struct { + basic.BasicTemplate +} + +func (t *EverestBasicTemplate) readFromFile(veneerFile string) error { + yamlFile, err := os.ReadFile(veneerFile) + if err != nil { + return err + } + + var yamlData interface{} + err = yaml.Unmarshal(yamlFile, &yamlData) + if err != nil { + return err + } + + jsonData, err := json.Marshal(yamlData) + if err != nil { + return err + } + + return json.Unmarshal(jsonData, t) +} + +func (t *EverestBasicTemplate) toByteArray() ([]byte, error) { + bytes, err := json.Marshal(t) + if err != nil { + return nil, err + } + var jsonInterface interface{} + err = json.Unmarshal(bytes, &jsonInterface) + if err != nil { + return nil, err + } + return yaml.Marshal(jsonInterface) +} + +func (t *EverestBasicTemplate) update(release release, channel string) error { + for i, meta := range t.Entries { + if meta.Schema == declcfg.SchemaChannel && meta.Name == channel { + bytes, err := updateBlob(meta.Blob, release, channel) + if err != nil { + return fmt.Errorf("failed to update channel data %s", channel) + } + t.Entries[i].Blob.UnmarshalJSON(bytes) + break + } + } + + bundle, err := release.bundle() + if err != nil { + return fmt.Errorf("failed to create new bundle: %w", err) + } + t.Entries = append(t.Entries, bundle) + return nil +} + +func updateBlob(channelBlob json.RawMessage, release release, channel string) ([]byte, error) { + var ch declcfg.Channel + err := json.Unmarshal(channelBlob, &ch) + if err != nil { + return nil, fmt.Errorf("error unmarshaling channel %s: %w", channel, err) + } + + if len(ch.Entries) == 0 { + return nil, fmt.Errorf("versions list is empty for %s channel", channel) + } + lastVersion := ch.Entries[len(ch.Entries)-1] + // new version inherits the replaces from the last version and adds a new skip to the skips + newVersion := declcfg.ChannelEntry{ + Name: versionPrefix + release.newVersion.String(), + Replaces: lastVersion.Replaces, + Skips: append(lastVersion.Skips, lastVersion.Name), + } + // the previous version shouldn't have any replaces and skips anymore + ch.Entries[len(ch.Entries)-1].Replaces = "" + ch.Entries[len(ch.Entries)-1].Skips = nil + // add the new version to the list of versions + ch.Entries = append(ch.Entries, newVersion) + return json.Marshal(ch) +} diff --git a/tools/go.mod b/tools/go.mod new file mode 100644 index 0000000..7c81799 --- /dev/null +++ b/tools/go.mod @@ -0,0 +1,139 @@ +module github.com/percona/everest-catalog + +go 1.22.4 + +require ( + github.com/hashicorp/go-version v1.7.0 + github.com/operator-framework/operator-registry v1.44.0 + github.com/spf13/cobra v1.8.1 + github.com/stretchr/testify v1.9.0 + gopkg.in/yaml.v3 v3.0.1 +) + +require ( + github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/Microsoft/hcsshim v0.12.3 // indirect + github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/containerd/cgroups/v3 v3.0.3 // indirect + github.com/containerd/containerd v1.7.18 // indirect + github.com/containerd/continuity v0.4.2 // indirect + github.com/containerd/errdefs v0.1.0 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/containerd/ttrpc v1.2.4 // indirect + github.com/containerd/typeurl/v2 v2.1.1 // indirect + github.com/containers/common v0.59.1 // indirect + github.com/containers/image/v5 v5.31.1 // indirect + github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect + github.com/containers/ocicrypt v1.1.10 // indirect + github.com/containers/storage v1.54.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/cli v27.0.2+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/docker/docker v26.1.3+incompatible // indirect + github.com/docker/docker-credential-helpers v0.8.1 // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.2 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-git/go-git/v5 v5.11.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-migrate/migrate/v4 v4.17.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/cel-go v0.17.8 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect + github.com/h2non/filetype v1.1.3 // indirect + github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/joelanford/ignore v0.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.8 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/sys/mountinfo v0.7.1 // indirect + github.com/moby/sys/sequential v0.5.0 // indirect + github.com/moby/sys/user v0.1.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/gomega v1.33.1 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/opencontainers/runtime-spec v1.2.0 // indirect + github.com/operator-framework/api v0.26.0 // indirect + github.com/otiai10/copy v1.14.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.0 // indirect + github.com/prometheus/client_model v0.6.0 // indirect + github.com/prometheus/common v0.51.1 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect + go.etcd.io/bbolt v1.3.10 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/sdk v1.23.1 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect + go.opentelemetry.io/proto/otlp v1.1.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/term v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/time v0.5.0 // indirect + google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/grpc v1.64.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/api v0.30.2 // indirect + k8s.io/apiextensions-apiserver v0.30.2 // indirect + k8s.io/apimachinery v0.30.2 // indirect + k8s.io/apiserver v0.30.2 // indirect + k8s.io/client-go v0.30.2 // indirect + k8s.io/component-base v0.30.2 // indirect + k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect + sigs.k8s.io/controller-runtime v0.18.4 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/tools/go.sum b/tools/go.sum new file mode 100644 index 0000000..01c1e1b --- /dev/null +++ b/tools/go.sum @@ -0,0 +1,485 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/Microsoft/hcsshim v0.12.3 h1:LS9NXqXhMoqNCplK1ApmVSfB4UnVLRDWRapB6EIlxE0= +github.com/Microsoft/hcsshim v0.12.3/go.mod h1:Iyl1WVpZzr+UkzjekHZbV8o5Z9ZkxNGx6CtY2Qg/JVQ= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= +github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= +github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao= +github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4= +github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM= +github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo= +github.com/containerd/ttrpc v1.2.4/go.mod h1:ojvb8SJBSch0XkqNO0L0YX/5NxR3UnVk2LzFKBK0upc= +github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4= +github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0= +github.com/containers/common v0.59.1 h1:7VkmJN3YvD0jLFwaUjLHSRJ98JLffydiyOJjYr0dUTo= +github.com/containers/common v0.59.1/go.mod h1:53VicJCZ2AD0O+Br7VVoyrS7viXF4YmwlTIocWUT8XE= +github.com/containers/image/v5 v5.31.1 h1:3x9soI6Biml/GiDLpkSmKrkRSwVGctxu/vONpoUdklA= +github.com/containers/image/v5 v5.31.1/go.mod h1:5QfOqSackPkSbF7Qxc1DnVNnPJKQ+KWLkfEfDpK590Q= +github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= +github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= +github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic= +github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8= +github.com/containers/storage v1.54.0 h1:xwYAlf6n9OnIlURQLLg3FYHbO74fQ/2W2N6EtQEUM4I= +github.com/containers/storage v1.54.0/go.mod h1:PlMOoinRrBSnhYODLxt4EXl0nmJt+X0kjG0Xdt9fMTw= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/distribution/distribution/v3 v3.0.0-alpha.1 h1:jn7I1gvjOvmLztH1+1cLiUFud7aeJCIQcgzugtwjyJo= +github.com/distribution/distribution/v3 v3.0.0-alpha.1/go.mod h1:LCp4JZp1ZalYg0W/TN05jarCQu+h4w7xc7ZfQF4Y/cY= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/cli v27.0.2+incompatible h1:IgWU3lWqAYNibtcxgl/PY4TB0eCmK1ZpNUZVJfenDQs= +github.com/docker/cli v27.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo= +github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= +github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/emicklei/go-restful/v3 v3.11.2 h1:1onLa9DcsMYO9P+CXaL0dStDqQ2EHHXLiz+BtnqkLAU= +github.com/emicklei/go-restful/v3 v3.11.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= +github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= +github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/cel-go v0.17.8 h1:j9m730pMZt1Fc4oKhCLUHfjj6527LuhYcYw0Rl8gqto= +github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= +github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= +github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg= +github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= +github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c h1:fEE5/5VNnYUoBOj2I9TP8Jc+a7lge3QWn9DKE7NCwfc= +github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c/go.mod h1:ObS/W+h8RYb1Y7fYivughjxojTmIu5iAIjSrSLCLeqE= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw= +github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU= +github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4= +github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/joelanford/ignore v0.1.0 h1:VawbTDeg5EL+PN7W8gxVzGerfGpVo3gFdR5ZAqnkYRk= +github.com/joelanford/ignore v0.1.0/go.mod h1:Vb0PQMAQXK29fmiPjDukpO8I2NTcp1y8LbhFijD1/0o= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= +github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= +github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= +github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= +github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/operator-framework/api v0.26.0 h1:YVntU2NkVl5zSLLwK5kFcH6P3oSvN9QDgTsY9mb4yUM= +github.com/operator-framework/api v0.26.0/go.mod h1:3IxOwzVUeGxYlzfwKCcfCyS+q3EEhWA/4kv7UehbeyM= +github.com/operator-framework/operator-registry v1.44.0 h1:NW5/xHYR77J2EUYm+6iBER1WNGLNS8gM+G5GBQWqTTs= +github.com/operator-framework/operator-registry v1.44.0/go.mod h1:55I4XJ//Erir98Mm9OlD8UURWE0HQgL/zlvpGF+gkig= +github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= +github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= +github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= +github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM= +github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= +github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= +github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= +github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw= +github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho= +github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U= +github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc= +github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ= +github.com/redis/go-redis/v9 v9.1.0 h1:137FnGdk+EQdCbye1FW+qOEcY5S+SpY9T0NiuqvtfMY= +github.com/redis/go-redis/v9 v9.1.0/go.mod h1:urWj3He21Dj5k4TK1y59xH8Uj6ATueP8AH1cY3lZl4c= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= +github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= +github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= +go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= +go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= +go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= +go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= +go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg= +go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 h1:ysCfPZB9AjUlMa1UHYup3c9dAOCMQX/6sxSfPBUoxHw= +go.opentelemetry.io/contrib/exporters/autoexport v0.46.1/go.mod h1:ha0aiYm+DOPsLHjh0zoQ8W8sLT+LJ58J3j47lGpSLrU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 h1:jd0+5t/YynESZqsSyPz+7PAFdEop0dlN0+PkyHYo8oI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0/go.mod h1:U707O40ee1FpQGyhvqnzmCJm1Wh6OX6GGBVn0E6Uyyk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 h1:bflGWrfYyuulcdxf14V6n9+CoQcu5SAAdHmDPAJnlps= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0/go.mod h1:qcTO4xHAxZLaLxPd60TdE88rxtItPHgHWqOhOGRr0as= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 h1:o8iWeVFa1BcLtVEV0LzrCxV2/55tB3xLxADr6Kyoey4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1/go.mod h1:SEVfdK4IoBnbT2FXNM/k8yC08MrfbhWk3U4ljM8B3HE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 h1:p3A5+f5l9e/kuEBwLOrnpkIDHQFlHmbiVxMURWRK6gQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1/go.mod h1:OClrnXUjBqQbInvjJFjYSnMxBSCXBF8r3b34WqjiIrQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I= +go.opentelemetry.io/otel/exporters/prometheus v0.44.0 h1:08qeJgaPC0YEBu2PQMbqU3rogTlyzpjhCI2b58Yn00w= +go.opentelemetry.io/otel/exporters/prometheus v0.44.0/go.mod h1:ERL2uIeBtg4TxZdojHUwzZfIFlUIjZtxubT5p4h1Gjg= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 h1:dEZWPjVN22urgYCza3PXRUGEyCB++y1sAqm6guWFesk= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0/go.mod h1:sTt30Evb7hJB/gEk27qLb1+l9n4Tb8HvHkR0Wx3S6CU= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 h1:VhlEQAPp9R1ktYfrPk5SOryw1e9LDDTZCbIPFrho0ec= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0/go.mod h1:kB3ufRbfU+CQ4MlUcqtW8Z7YEOBeK2DJ6CmR5rYYF3E= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/sdk v1.23.1 h1:O7JmZw0h76if63LQdsBMKQDWNb5oEcOThG9IrxscV+E= +go.opentelemetry.io/otel/sdk v1.23.1/go.mod h1:LzdEVR5am1uKOOwfBWFef2DCi1nu3SA8XQxx2IerWFk= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= +go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= +go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI= +k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI= +k8s.io/apiextensions-apiserver v0.30.2 h1:l7Eue2t6QiLHErfn2vwK4KgF4NeDgjQkCXtEbOocKIE= +k8s.io/apiextensions-apiserver v0.30.2/go.mod h1:lsJFLYyK40iguuinsb3nt+Sj6CmodSI4ACDLep1rgjw= +k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg= +k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/apiserver v0.30.2 h1:ACouHiYl1yFI2VFI3YGM+lvxgy6ir4yK2oLOsLI1/tw= +k8s.io/apiserver v0.30.2/go.mod h1:BOTdFBIch9Sv0ypSEcUR6ew/NUFGocRFNl72Ra7wTm8= +k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50= +k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs= +k8s.io/component-base v0.30.2 h1:pqGBczYoW1sno8q9ObExUqrYSKhtE5rW3y6gX88GZII= +k8s.io/component-base v0.30.2/go.mod h1:yQLkQDrkK8J6NtP+MGJOws+/PPeEXNpwFixsUI7h/OE= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= +k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= +sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= +sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/tools/release.go b/tools/release.go new file mode 100644 index 0000000..13c9dfa --- /dev/null +++ b/tools/release.go @@ -0,0 +1,61 @@ +package main + +import ( + "encoding/json" + "fmt" + goversion "github.com/hashicorp/go-version" + "github.com/operator-framework/operator-registry/alpha/declcfg" + "strings" +) + +const ( + rcBundle = "docker.io/perconalab/everest-operator-bundle:" + releaseBundle = "docker.io/percona/everest-operator-bundle:" +) + +type release struct { + isRC bool + newVersion goversion.Version + previousVersion goversion.Version +} + +func (r *release) image() string { + version := r.newVersion.String() + if r.isRC { + return rcBundle + version + } + return releaseBundle + version +} + +func (r *release) create(currentVersionStr, newVersionStr string) error { + currentVersion, err := goversion.NewVersion(currentVersionStr) + if err != nil { + return fmt.Errorf("%s: can not parse current version: %w", currentVersionStr, err) + } + + newVersion, err := goversion.NewVersion(newVersionStr) + if err != nil { + return fmt.Errorf("%s: can not parse new version: %w", newVersionStr, err) + } + + if strings.Contains(newVersionStr, "rc") { + r.isRC = true + } + r.newVersion = *newVersion + r.previousVersion = *currentVersion + return nil +} + +func (r *release) bundle() (*declcfg.Meta, error) { + bundle := declcfg.Bundle{Schema: declcfg.SchemaBundle, Image: r.image()} + bundleBytes, err := json.Marshal(bundle) + if err != nil { + return nil, err + } + + newEntry := declcfg.Meta{ + Schema: declcfg.SchemaBundle, + } + newEntry.Blob.UnmarshalJSON(bundleBytes) + return &newEntry, nil +} diff --git a/tools/veneer-update.go b/tools/veneer-update.go index 784a6d8..5a586c3 100644 --- a/tools/veneer-update.go +++ b/tools/veneer-update.go @@ -2,11 +2,6 @@ package main import ( "fmt" - "gopkg.in/yaml.v3" - "os" - "strings" - - goversion "github.com/hashicorp/go-version" "github.com/spf13/cobra" ) @@ -46,110 +41,23 @@ func main() { } } -type Entry struct { - Schema string `yaml:"schema"` - DefaultChannel string `yaml:"defaultChannel,omitempty"` - Name string `yaml:"name,omitempty"` - Versions []Version `yaml:"entries,omitempty"` - Package string `yaml:"package,omitempty"` - Image string `yaml:"image,omitempty"` -} - -type Template struct { - Schema string `yaml:"schema"` - Entries []Entry `yaml:"entries"` -} - -type Version struct { - Name string `yaml:"name"` - Replaces string `yaml:"replaces,omitempty"` - Skips []string `yaml:"skips,omitempty"` -} - -const ( - olmChannelSchema = "olm.channel" - olmBundleSchema = "olm.bundle" - - versionPrefix = "everest-operator.v" - - rcBundle = "docker.io/perconalab/everest-operator-bundle:" - releaseBundle = "docker.io/percona/everest-operator-bundle:" -) - func updateVeneer(veneerFile, channel, currentVersionStr, newVersionStr string) ([]byte, error) { - release, err := validateVersion(currentVersionStr, newVersionStr) + var r release + err := r.create(currentVersionStr, newVersionStr) if err != nil { return nil, fmt.Errorf("%s: invalid version format: %w", newVersionStr, err) } - source, err := os.ReadFile(veneerFile) + var t EverestBasicTemplate + err = t.readFromFile(veneerFile) if err != nil { - return nil, fmt.Errorf("could not read veneer file: %w", err) + return nil, fmt.Errorf("failed to read template: %w", err) } - var template Template - err = yaml.Unmarshal(source, &template) + err = t.update(r, channel) if err != nil { - fmt.Println("Error unmarshalling YAML:", err) - return nil, err - } - - for i, schema := range template.Entries { - if schema.Schema == olmChannelSchema && schema.Name == channel { - if len(schema.Versions) == 0 { - return nil, fmt.Errorf("versions list is empty for %s channel", channel) - } - lastVersion := schema.Versions[len(schema.Versions)-1] - // new version inherits the replaces from the last version and adds a new skip to the skips - newVersion := Version{ - Name: versionPrefix + release.newVersion.String(), - Replaces: lastVersion.Replaces, - Skips: append(lastVersion.Skips, lastVersion.Name), - } - // the previous version shouldn't have any replaces and skips anymore - schema.Versions[len(schema.Versions)-1].Replaces = "" - schema.Versions[len(schema.Versions)-1].Skips = nil - // add the new version to the list of versions - schema.Versions = append(schema.Versions, newVersion) - template.Entries[i] = schema - break - } + return nil, fmt.Errorf("failed to update template: %w", err) } - template.Entries = append(template.Entries, Entry{Schema: olmBundleSchema, Image: release.image()}) - return yaml.Marshal(template) -} - -type release struct { - isRC bool - newVersion goversion.Version - previousVersion goversion.Version -} - -func (r release) image() string { - version := r.newVersion.String() - if r.isRC { - return rcBundle + version - } - return releaseBundle + version -} - -func validateVersion(currentVersionStr, newVersionStr string) (release, error) { - result := release{} - currentVersion, err := goversion.NewVersion(currentVersionStr) - if err != nil { - return result, fmt.Errorf("%s: can not parse current version: %w", currentVersionStr, err) - } - - newVersion, err := goversion.NewVersion(newVersionStr) - if err != nil { - return result, fmt.Errorf("%s: can not parse new version: %w", newVersionStr, err) - } - - if strings.Contains(newVersionStr, "rc") { - result.isRC = true - } - result.newVersion = *newVersion - result.previousVersion = *currentVersion - return result, nil + return t.toByteArray() } diff --git a/tools/veneer-update_test.go b/tools/veneer-update_test.go index ba31c9d..e2df896 100644 --- a/tools/veneer-update_test.go +++ b/tools/veneer-update_test.go @@ -21,7 +21,7 @@ func TestPatch(t *testing.T) { channel: "fast-v0", currentVersion: "0.9.1", newVersion: "0.9.2", - expectedOutput: NonRCPatchExpected, + expectedOutput: nonRCPatchExpected, }, { name: "RC patch release over non-rc release", @@ -72,14 +72,11 @@ func TestPatch(t *testing.T) { } } -var NonRCPatchExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 +var nonRCPatchExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -89,10 +86,10 @@ entries: - everest-operator.v0.0.0 - everest-operator.v0.9.0 - everest-operator.v0.9.1 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -100,29 +97,29 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/percona/everest-operator-bundle:0.9.2 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/percona/everest-operator-bundle:0.9.2 + schema: olm.bundle +schema: olm.template.basic ` -var rcPatchOverNonRCExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 +var rcPatchOverNonRCExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -132,10 +129,10 @@ entries: - everest-operator.v0.0.0 - everest-operator.v0.9.0 - everest-operator.v0.9.1 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -143,29 +140,29 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.9.2-rc1 + schema: olm.bundle +schema: olm.template.basic ` -var rcOverRcPatchExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 +var rcOverRcPatchExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -173,10 +170,10 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -186,29 +183,29 @@ entries: - everest-operator.v0.0.0 - everest-operator.v0.9.0 - everest-operator.v0.9.1-rc1 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.9.1-rc2 + schema: olm.bundle +schema: olm.template.basic ` -var nonRCMinorExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 +var nonRCMinorExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -218,10 +215,10 @@ entries: - everest-operator.v0.0.0 - everest-operator.v0.9.0 - everest-operator.v0.9.1 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -229,29 +226,29 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/percona/everest-operator-bundle:0.10.0 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/percona/everest-operator-bundle:0.10.0 + schema: olm.bundle +schema: olm.template.basic ` -var minorReleasesFirstRCExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 +var minorReleasesFirstRCExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -261,10 +258,10 @@ entries: - everest-operator.v0.0.0 - everest-operator.v0.9.0 - everest-operator.v0.9.1 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -272,28 +269,29 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 skips: - everest-operator.v0.9.0 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/perconalab/everest-operator-bundle:0.10.0-rc1 + schema: olm.bundle +schema: olm.template.basic ` -var minorReleaseStableChannelExpected = `schema: olm.template.basic -entries: - - schema: olm.package - defaultChannel: stable-v0 + +var minorReleaseStableChannelExpected = `entries: + - defaultChannel: stable-v0 name: everest-operator - - schema: olm.channel - name: fast-v0 - entries: + schema: olm.package + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 @@ -301,10 +299,10 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v0 package: everest-operator - - schema: olm.channel - name: fast-v1 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.0.0 - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1-rc1 @@ -312,19 +310,22 @@ entries: skips: - everest-operator.v0.0.0 - everest-operator.v0.9.0 + name: fast-v1 package: everest-operator - - schema: olm.channel - name: stable-v0 - entries: + schema: olm.channel + - entries: - name: everest-operator.v0.9.0 - name: everest-operator.v0.9.1 - name: everest-operator.v0.10.0 skips: - everest-operator.v0.9.0 - everest-operator.v0.9.1 + name: stable-v0 package: everest-operator - - schema: olm.bundle - image: docker.io/perconalab/everest-operator-bundle:0.0.0 - - schema: olm.bundle - image: docker.io/percona/everest-operator-bundle:0.10.0 + schema: olm.channel + - image: docker.io/perconalab/everest-operator-bundle:0.0.0 + schema: olm.bundle + - image: docker.io/percona/everest-operator-bundle:0.10.0 + schema: olm.bundle +schema: olm.template.basic ` From c2eaa2c910c0893978cb24af891ed4d8f20e3a57 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 12 Jul 2024 11:59:45 +0200 Subject: [PATCH 7/8] use fixed opm version in checks --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c5a13bb..8dda249 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -24,7 +24,7 @@ jobs: - name: Check default main state - generated files run: | echo "Download opm tool" - curl -Lo /tmp/opm https://github.com/operator-framework/operator-registry/releases/latest/download/linux-amd64-opm + curl -Lo /tmp/opm https://github.com/operator-framework/operator-registry/releases/v1.44.0/download/linux-amd64-opm chmod +x /tmp/opm echo "Render catalog" /tmp/opm alpha render-template basic -o yaml ./veneer/everest-operator.yaml > ./catalog/everest-operator/catalog.yaml From d69805409c50d8ee2d48642e217bd191fd8e2e98 Mon Sep 17 00:00:00 2001 From: Oksana Grishchenko Date: Fri, 12 Jul 2024 12:02:42 +0200 Subject: [PATCH 8/8] opm url --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8dda249..125968a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -24,7 +24,7 @@ jobs: - name: Check default main state - generated files run: | echo "Download opm tool" - curl -Lo /tmp/opm https://github.com/operator-framework/operator-registry/releases/v1.44.0/download/linux-amd64-opm + curl -Lo /tmp/opm https://github.com/operator-framework/operator-registry/releases/download/v1.44.0/linux-amd64-opm chmod +x /tmp/opm echo "Render catalog" /tmp/opm alpha render-template basic -o yaml ./veneer/everest-operator.yaml > ./catalog/everest-operator/catalog.yaml