Closed miq-bot closed 7 months ago
@miq-bot A conflict occurred during the backport of this pull request to quinteros
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the quinteros
branch in order to resolve this.
Conflict details:
diff --cc manageiq-operator/go.mod
index 09898e4,ad31f2a..0000000
--- a/manageiq-operator/go.mod
+++ b/manageiq-operator/go.mod
@@@ -5,8 -5,8 +5,13 @@@ go 1.2
require (
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.31.1
++<<<<<<< HEAD
+ github.com/openshift/api v0.0.0-20240122205920-2054c69227a1
+ github.com/operator-framework/api v0.21.0
++=======
+ github.com/openshift/api v0.0.0-20240202140003-8b34b9854c7f
+ github.com/operator-framework/api v0.22.0
++>>>>>>> c538f00 (Merge pull request #1049 from miq-bot/update_go_dependencies)
k8s.io/api v0.29.1
k8s.io/apimachinery v0.29.1
k8s.io/client-go v0.29.1
diff --cc manageiq-operator/go.sum
index 3b81dbf,9695a45..0000000
--- a/manageiq-operator/go.sum
+++ b/manageiq-operator/go.sum
@@@ -98,10 -98,10 +98,17 @@@ github.com/onsi/gomega v1.7.1/go.mod h1
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
++<<<<<<< HEAD
+github.com/openshift/api v0.0.0-20240122205920-2054c69227a1 h1:MxGleUZvyxsjiwFWr3wL31Z9bY91r6dX6ho2JuNlLrQ=
+github.com/openshift/api v0.0.0-20240122205920-2054c69227a1/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/operator-framework/api v0.21.0 h1:89LhqGTLskxpPR4siEaorkF9PY3KLI51S5mFxP6q1G8=
+github.com/operator-framework/api v0.21.0/go.mod h1:3tsDLxXChMY1KgxO5v1CZQogHNQCIMy14YXkXqA5lT4=
++=======
+ github.com/openshift/api v0.0.0-20240202140003-8b34b9854c7f h1:yJ8mEpEW2aJo+97wguYL+ehCsJe/pbeKjFsbdMuuEJI=
+ github.com/openshift/api v0.0.0-20240202140003-8b34b9854c7f/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+ github.com/operator-framework/api v0.22.0 h1:UZSn+iaQih4rCReezOnWTTJkMyawwV5iLnIItaOzytY=
+ github.com/operator-framework/api v0.22.0/go.mod h1:p/7YDbr+n4fmESfZ47yLAV1SvkfE6NU2aX8KhcfI0GA=
++>>>>>>> c538f00 (Merge pull request #1049 from miq-bot/update_go_dependencies)
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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@Fryguy unrecognized command 'A', ignoring...
Accepted commands are: add_label, add_reviewer, request_review, assign, close_issue, cross_repo_test, move_issue, remove_label, rm_label, remove_reviewer, set_milestone, unassign
Backported to quinteros
in commit 500e02cbff59b843685748a475696c7b5394617d.
commit 500e02cbff59b843685748a475696c7b5394617d
Author: Brandon Dunne <brandondunne@hotmail.com>
Date: Mon Feb 5 10:53:10 2024 -0500
Merge pull request #1049 from miq-bot/update_go_dependencies
Update go dependencies
(cherry picked from commit c538f001e41643bf7c447badb70359dadc7cf3fa)
Update the operator dependencies in go.mod