Skip to content

Commit 04662e2

Browse files
Automated Releasesubmariner-bot
authored andcommitted
Update Submariner dependencies to v0.22.0-m1
Signed-off-by: Automated Release <[email protected]>
1 parent 9afb071 commit 04662e2

File tree

4 files changed

+41
-35
lines changed

4 files changed

+41
-35
lines changed

api/v1alpha1/versions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package v1alpha1
2020

2121
var (
2222
DefaultRepo = "quay.io/submariner"
23-
DefaultSubmarinerOperatorVersion = "0.22.0-m0"
24-
DefaultSubmarinerVersion = "0.22.0-m0"
25-
DefaultLighthouseVersion = "0.22.0-m0"
23+
DefaultSubmarinerOperatorVersion = "0.22.0-m1"
24+
DefaultSubmarinerVersion = "0.22.0-m1"
25+
DefaultLighthouseVersion = "0.22.0-m1"
2626
)

go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.24.0
55
require (
66
github.com/coreos/go-semver v0.3.1
77
github.com/go-logr/logr v1.4.3
8-
github.com/onsi/ginkgo/v2 v2.23.4
9-
github.com/onsi/gomega v1.37.0
8+
github.com/onsi/ginkgo/v2 v2.24.0
9+
github.com/onsi/gomega v1.38.0
1010
github.com/openshift/api v0.0.0-20230714214528-de6ad7979b00
1111
github.com/pkg/errors v0.9.1
1212
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1
1313
github.com/prometheus-operator/prometheus-operator/pkg/client v0.84.1
14-
github.com/prometheus/client_golang v1.22.0
15-
github.com/submariner-io/admiral v0.22.0-m0
16-
github.com/submariner-io/shipyard v0.22.0-m0
17-
github.com/submariner-io/submariner v0.22.0-m0.0.20250730124428-4797e0925ebb
14+
github.com/prometheus/client_golang v1.23.0
15+
github.com/submariner-io/admiral v0.22.0-m1
16+
github.com/submariner-io/shipyard v0.22.0-m1
17+
github.com/submariner-io/submariner v0.22.0-m1
1818
golang.org/x/net v0.43.0
1919
k8s.io/api v0.33.4
2020
k8s.io/apiextensions-apiserver v0.33.4
@@ -27,6 +27,7 @@ require (
2727
)
2828

2929
require (
30+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3233
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -56,9 +57,9 @@ require (
5657
github.com/modern-go/reflect2 v1.0.2 // indirect
5758
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5859
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
59-
github.com/prometheus/client_model v0.6.1 // indirect
60-
github.com/prometheus/common v0.62.0 // indirect
61-
github.com/prometheus/procfs v0.15.1 // indirect
60+
github.com/prometheus/client_model v0.6.2 // indirect
61+
github.com/prometheus/common v0.65.0 // indirect
62+
github.com/prometheus/procfs v0.16.1 // indirect
6263
github.com/rs/zerolog v1.34.0 // indirect
6364
github.com/spf13/pflag v1.0.5 // indirect
6465
github.com/x448/float16 v0.8.4 // indirect
@@ -71,7 +72,7 @@ require (
7172
golang.org/x/term v0.34.0 // indirect
7273
golang.org/x/text v0.28.0 // indirect
7374
golang.org/x/time v0.12.0 // indirect
74-
golang.org/x/tools v0.35.0 // indirect
75+
golang.org/x/tools v0.36.0 // indirect
7576
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7677
google.golang.org/protobuf v1.36.6 // indirect
7778
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

go.sum

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
2+
github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
13
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
24
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
35
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -88,10 +90,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
8890
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
8991
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
9092
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
91-
github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
92-
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
93-
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
94-
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
93+
github.com/onsi/ginkgo/v2 v2.24.0 h1:obZz8LAnHicNdbBqvG3ytAFx8fgza+i1IDpBVcHT2YE=
94+
github.com/onsi/ginkgo/v2 v2.24.0/go.mod h1:ppTWQ1dh9KM/F1XgpeRqelR+zHVwV81DGRSDnFxK7Sk=
95+
github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY=
96+
github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o=
9597
github.com/openshift/api v0.0.0-20230714214528-de6ad7979b00 h1:sYXq/GVWN0Un+6eEGd3vft4dY+M3i0RSL3GJhvQBOGY=
9698
github.com/openshift/api v0.0.0-20230714214528-de6ad7979b00/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs=
9799
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -105,14 +107,14 @@ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1 h
105107
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.84.1/go.mod h1:MruMqbSS9aYrKhBImrO9X9g52hwz3I0B+tcoeAwkmuM=
106108
github.com/prometheus-operator/prometheus-operator/pkg/client v0.84.1 h1:VgjWJqUgjLWs5JNziNBo+7r6AzNyktT7Ibs/HfB7Lcc=
107109
github.com/prometheus-operator/prometheus-operator/pkg/client v0.84.1/go.mod h1:ZjOuYKhuRzx4TSoZ3ocQQulPngg7beT5ZMBbeQx65sA=
108-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
109-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
110-
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
111-
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
112-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
113-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
114-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
115-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
110+
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
111+
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
112+
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
113+
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
114+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
115+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
116+
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
117+
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
116118
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
117119
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
118120
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
@@ -126,12 +128,12 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
126128
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
127129
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
128130
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
129-
github.com/submariner-io/admiral v0.22.0-m0 h1:Fu/ZS9/nZaPVtIjRwDSOwnDjTjn7z+ExlSiTCL44Eck=
130-
github.com/submariner-io/admiral v0.22.0-m0/go.mod h1:/TFjweSHJGNWguW7A6RtQSsN6ruckOyYIQ/FYHHoPI0=
131-
github.com/submariner-io/shipyard v0.22.0-m0 h1:j9ppv/JikwnfSkI5i+StWBWNi4uej+d/OZyzIxWvrKs=
132-
github.com/submariner-io/shipyard v0.22.0-m0/go.mod h1:8rBTmE8D6smPA6050GUt9BhEmx4OzX4m7U4giALY8GI=
133-
github.com/submariner-io/submariner v0.22.0-m0.0.20250730124428-4797e0925ebb h1:+WN2YQRssSHUU6n9ZQrTkj1W3PrKRBdQOLxRaEkbcsE=
134-
github.com/submariner-io/submariner v0.22.0-m0.0.20250730124428-4797e0925ebb/go.mod h1:5/pr5YIlpQhmx0x9lYLWhJrBnG8/OFwG6qTY3JocXc0=
131+
github.com/submariner-io/admiral v0.22.0-m1 h1:SXX+ntVWWeOXgLo7hLvsElgWdqeFrqcIV64o5CuJoTw=
132+
github.com/submariner-io/admiral v0.22.0-m1/go.mod h1:SgP1XFh4B780UzNMOqILSHroOiykHWNmg2rjQYszbJ4=
133+
github.com/submariner-io/shipyard v0.22.0-m1 h1:JRho0/+vIzm2YscpVVrOjDoZZHyvkkpSd+c5OD3xv0U=
134+
github.com/submariner-io/shipyard v0.22.0-m1/go.mod h1:amRaRqk41/TCk1JiO16s5OwVW1Up299tuSwomIKELDE=
135+
github.com/submariner-io/submariner v0.22.0-m1 h1:AjTMfHyhh7WyaRkoAwHdoMuTZTutVg9EI9mkUMw833g=
136+
github.com/submariner-io/submariner v0.22.0-m1/go.mod h1:c4bugXANk0Qf13nli6C+L/thgL5LgFWIXRxa30z+I6M=
135137
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
136138
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
137139
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -186,8 +188,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
186188
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
187189
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
188190
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
189-
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
190-
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
191+
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
192+
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
191193
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
192194
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
193195
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/controllers/submariner/submariner_controller.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,11 @@ func (r *Reconciler) setupSecretSyncer(ctx context.Context, instance *submopv1a1
345345
Direction: syncer.None,
346346
RestMapper: r.config.ScopedClient.RESTMapper(),
347347
Scheme: r.config.Scheme,
348-
Federator: federate.NewCreateOrUpdateFederator(
349-
r.config.DynClient, r.config.ScopedClient.RESTMapper(), namespace, ""),
348+
Federator: federate.NewCreateOrUpdateFederator(federate.CreateOrUpdateOptions{
349+
Client: r.config.DynClient,
350+
RestMapper: r.config.ScopedClient.RESTMapper(),
351+
TargetNamespace: namespace,
352+
}),
350353
Transform: func(from runtime.Object, _ int, _ syncer.Operation) (runtime.Object, bool) {
351354
secret := from.(*corev1.Secret)
352355
logger.V(level.TRACE).Info("Transforming secret", "secret", secret)

0 commit comments

Comments
 (0)