Merge pull request #697 from redhat-marketplace/release/2.17.7

Release/2.17.7
redhat-marketplace · Dec 5, 2024 · a0fe704 · a0fe704
2 parents 81a6235 + a9f2321
commit a0fe704
Show file tree

Hide file tree

Showing 45 changed files with 1,338 additions and 914 deletions.
diff --git a/.github/workflows/branch_build.yml b/.github/workflows/branch_build.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3
@@ -74,7 +74,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3
@@ -100,7 +100,7 @@ jobs:
     name: Build Images
     runs-on: ubuntu-20.04
     env:
-      GO_VERSION: "1.21"
+      GO_VERSION: "1.22"
     defaults:
       run:
         shell: bash
@@ -112,7 +112,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2
@@ -235,7 +235,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build Base
     runs-on: ubuntu-20.04
     env:
-      GO_VERSION: "1.21"
+      GO_VERSION: "1.22"
       IMAGE_REGISTRY: quay.io/rh-marketplace
     defaults:
       run:
@@ -20,7 +20,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v4
       with:
-        go-version: ^1.21
+        go-version: ^1.22
         cache: false
       id: go
 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3
@@ -164,7 +164,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3
@@ -302,7 +302,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3
@@ -439,7 +439,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3

diff --git a/.github/workflows/release_status.yml b/.github/workflows/release_status.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.21"
+        go-version: "1.22"
         cache: false
     - name: Cache Go modules
       uses: actions/cache@v3

diff --git a/airgap/v2/apis/buf.lock b/airgap/v2/apis/buf.lock
@@ -4,5 +4,5 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 7a6bc1e3207144b38e9066861e1de0ff
-    digest: shake256:d646836485c34192401253703c4e7ce899c826fceec060bf4b2a62c4749bd9976dc960833e134a1f814725e1ffd60b1bb3cf0335a7e99ef0e8cec34b070ffb66
+    commit: c0913f24652a4cfc95f77d97443a5005
+    digest: shake256:0ef3248c6235d420fe61f373154adcde6b94e3297f82472b1d8d8c3747240b61b4a10405e2a6f8ac1c98816ac6e690ea7871024aa5ae0e035cd540214667ceed
diff --git a/airgap/v2/buf.lock b/airgap/v2/buf.lock
@@ -4,8 +4,8 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 8bc2c51e08c447cd8886cdea48a73e14
-    digest: shake256:a969155953a5cedc5b2df5b42c368f2bc66ff8ce1804bc96e0f14ff2ee8a893687963058909df844d1643cdbc98ff099d2daa6bc9f9f5b8886c49afdc60e19af
+    commit: c0913f24652a4cfc95f77d97443a5005
+    digest: shake256:0ef3248c6235d420fe61f373154adcde6b94e3297f82472b1d8d8c3747240b61b4a10405e2a6f8ac1c98816ac6e690ea7871024aa5ae0e035cd540214667ceed
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway

diff --git a/airgap/v2/go.mod b/airgap/v2/go.mod
@@ -1,44 +1,46 @@
 module github.com/redhat-marketplace/redhat-marketplace-operator/airgap/v2
 
-go 1.21
+go 1.22.0
+
+toolchain go1.22.9
 
 require (
 	emperror.dev/errors v0.8.1
-	github.com/canonical/go-dqlite v1.21.0
 	github.com/go-co-op/gocron v1.35.3
 	github.com/go-gormigrate/gormigrate/v2 v2.1.1
 	github.com/go-logr/logr v1.4.1
-	github.com/go-logr/zapr v1.2.4
+	github.com/go-logr/zapr v1.3.0
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
 	github.com/mattn/go-sqlite3 v1.14.22
-	github.com/onsi/gomega v1.29.0
+	github.com/onsi/gomega v1.32.0
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.7.0
+	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.16.0
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0
-	golang.org/x/sync v0.6.0
+	golang.org/x/sync v0.8.0
 	google.golang.org/grpc v1.63.2
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
 	google.golang.org/protobuf v1.33.0
 	gorm.io/driver/sqlite v1.5.5
 	gorm.io/gorm v1.25.7
-	sigs.k8s.io/controller-runtime v0.16.5
+	sigs.k8s.io/controller-runtime v0.18.5
 )
 
 require (
-	github.com/onsi/ginkgo/v2 v2.13.0
+	github.com/avast/retry-go/v4 v4.6.0
+	github.com/canonical/go-dqlite/v3 v3.0.0
+	github.com/onsi/ginkgo/v2 v2.17.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20240415151819-79826c84ba32
-	k8s.io/component-base v0.28.12
+	k8s.io/component-base v0.30.7
 )
 
 require (
-	github.com/Rican7/retry v0.3.0 // indirect
-	github.com/avast/retry-go v3.0.0+incompatible // indirect
-	github.com/avast/retry-go/v4 v4.6.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/Rican7/retry v0.3.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
@@ -62,35 +64,35 @@ require (
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240415151819-79826c84ba32 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apimachinery v0.28.12 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/apimachinery v0.30.7 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace (
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 	github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.66.0
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.66.0
-	k8s.io/api => k8s.io/api v0.28.12
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12
-	k8s.io/apimachinery => k8s.io/apimachinery v0.28.12
-	k8s.io/apiserver => k8s.io/apiserver v0.28.12
-	k8s.io/client-go => k8s.io/client-go v0.28.12
-	k8s.io/component-base => k8s.io/component-base v0.28.12
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5
+	k8s.io/api => k8s.io/api v0.30.7
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.7
+	k8s.io/apimachinery => k8s.io/apimachinery v0.30.7
+	k8s.io/apiserver => k8s.io/apiserver v0.30.7
+	k8s.io/client-go => k8s.io/client-go v0.30.7
+	k8s.io/component-base => k8s.io/component-base v0.30.7
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.7
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.18.5
 )