search

ManageIQ / manageiq-pods

ManageIQ on Kubernetes and OpenShift
Apache License 2.0
51 stars 100 forks source link

Update go dependencies #1129

Closed miq-bot closed 2 months ago

miq-bot commented 3 months ago

Update the operator dependencies in go.mod

miq-bot commented 3 months ago

Checked commit https://github.com/miq-bot/manageiq-pods/commit/d74929fb5abbc76ccbcdc909a3e487c02f437c8f with ruby 3.1.5, rubocop 1.56.3, haml-lint 0.51.0, and yamllint 0 files checked, 0 offenses detected Everything looks fine. :+1:

Fryguy commented 2 months ago

@miq-bot A conflict occurred during the backport of this pull request to radjabov.

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 radjabov branch in order to resolve this.

Conflict details:

diff --cc manageiq-operator/go.mod
index 1e16c1f,e34e755..0000000
--- a/manageiq-operator/go.mod
+++ b/manageiq-operator/go.mod
@@@ -7,11 -7,11 +7,19 @@@ toolchain go1.22.
  require (
    github.com/onsi/ginkgo/v2 v2.19.0
    github.com/onsi/gomega v1.33.1
++<<<<<<< HEAD
 +  github.com/openshift/api v0.0.0-20240605201059-cefcda60d938
 +  github.com/operator-framework/api v0.25.0
 +  k8s.io/api v0.30.1
 +  k8s.io/apimachinery v0.30.1
 +  k8s.io/client-go v0.30.1
++=======
+   github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f
+   github.com/operator-framework/api v0.26.0
+   k8s.io/api v0.30.2
+   k8s.io/apimachinery v0.30.2
+   k8s.io/client-go v0.30.2
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
    sigs.k8s.io/controller-runtime v0.18.4
  )

@@@ -35,7 -35,7 +43,11 @@@ require 
    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
++<<<<<<< HEAD
 +  github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
++=======
+   github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 // indirect
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
    github.com/google/uuid v1.6.0 // indirect
    github.com/imdario/mergo v0.3.16 // indirect
    github.com/josharian/intern v1.0.0 // indirect
@@@ -53,11 -53,11 +65,16 @@@
    github.com/spf13/pflag v1.0.5 // indirect
    go.uber.org/multierr v1.11.0 // indirect
    go.uber.org/zap v1.27.0 // indirect
++<<<<<<< HEAD
 +  golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
 +  golang.org/x/net v0.26.0 // indirect
++=======
+   golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+   golang.org/x/net v0.27.0 // indirect
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
    golang.org/x/oauth2 v0.21.0 // indirect
-   golang.org/x/sys v0.21.0 // indirect
-   golang.org/x/term v0.21.0 // indirect
+   golang.org/x/sys v0.22.0 // indirect
+   golang.org/x/term v0.22.0 // indirect
    golang.org/x/text v0.16.0 // indirect
    golang.org/x/time v0.5.0 // indirect
    golang.org/x/tools v0.22.0 // indirect
@@@ -66,9 -66,9 +83,15 @@@
    gopkg.in/inf.v0 v0.9.1 // indirect
    gopkg.in/yaml.v2 v2.4.0 // indirect
    gopkg.in/yaml.v3 v3.0.1 // indirect
++<<<<<<< HEAD
 +  k8s.io/apiextensions-apiserver v0.30.1 // indirect
 +  k8s.io/klog/v2 v2.120.1 // indirect
 +  k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
++=======
+   k8s.io/apiextensions-apiserver v0.30.2 // indirect
+   k8s.io/klog/v2 v2.130.1 // indirect
+   k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 // indirect
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
    k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
    sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
    sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
diff --cc manageiq-operator/go.sum
index f270b4c,a21c18b..0000000
--- a/manageiq-operator/go.sum
+++ b/manageiq-operator/go.sum
@@@ -41,8 -41,8 +41,13 @@@ github.com/google/go-cmp v0.6.0/go.mod 
  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=
++<<<<<<< HEAD
 +github.com/google/pprof v0.0.0-20240528025155-186aa0362fba h1:ql1qNgCyOB7iAEk8JTNM+zJrgIbnyCKX/wdlyPufP5g=
 +github.com/google/pprof v0.0.0-20240528025155-186aa0362fba/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
++=======
+ github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 h1:e+8XbKB6IMn8A4OAyZccO4pYfB3s7bt6azNIPE7AnPg=
+ github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
  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/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
@@@ -70,10 -70,10 +75,17 @@@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9C
  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=
++<<<<<<< HEAD
 +github.com/openshift/api v0.0.0-20240605201059-cefcda60d938 h1:3Y0E8q6pFb8PgzW0N52jVZBollMeW1kI13iU/vXPCnc=
 +github.com/openshift/api v0.0.0-20240605201059-cefcda60d938/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 +github.com/operator-framework/api v0.25.0 h1:pSQwFSoPmZaTIERadawxtCwicehLkC7i9n3w3+70SVI=
 +github.com/operator-framework/api v0.25.0/go.mod h1:PvyCQb0x53ytIqdTECH5e+iqv+am3uZ0qGsZWmL35gQ=
++=======
+ github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f h1:8qy74aofCvUwCdPafxgdWFsd3oCoMXhjaaCsXaWNCGM=
+ github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+ github.com/operator-framework/api v0.26.0 h1:YVntU2NkVl5zSLLwK5kFcH6P3oSvN9QDgTsY9mb4yUM=
+ github.com/operator-framework/api v0.26.0/go.mod h1:3IxOwzVUeGxYlzfwKCcfCyS+q3EEhWA/4kv7UehbeyM=
++>>>>>>> 21dde7e (Merge pull request #1129 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=
@@@ -162,18 -162,18 +174,33 @@@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklb
  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=
++<<<<<<< HEAD
 +k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
 +k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
 +k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
 +k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
 +k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
 +k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
 +k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
 +k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
 +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-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5TxDkI7OGJjBNBzq5fJtLA=
 +k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
++=======
+ 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/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
+ k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
+ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+ k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+ k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 h1:T5TEV4a+pEjc+j9Xui3MGGeoDLIN6uzZrx8NYotFMgQ=
+ k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
++>>>>>>> 21dde7e (Merge pull request #1129 from miq-bot/update_go_dependencies)
  k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
  k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
  sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
miq-bot commented 2 months ago

@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

Fryguy commented 2 months ago

Backported to radjabov in commit fa04aba5dcb1c9ef86745d46ba272644e3afae28.

commit fa04aba5dcb1c9ef86745d46ba272644e3afae28
Author: Brandon Dunne <brandondunne@hotmail.com>
Date:   Mon Jul 8 15:51:13 2024 -0400

    Merge pull request #1129 from miq-bot/update_go_dependencies

    Update go dependencies

    (cherry picked from commit 21dde7ef4dcaec41f127813deea194ff7a8cdc8e)