diff --git a/api/go.mod b/api/go.mod index 823ef328..906a212c 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,8 +3,8 @@ module github.com/openstack-k8s-operators/manila-operator/api go 1.21 require ( - github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe - github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe + github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283 + github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283 k8s.io/api v0.29.9 k8s.io/apimachinery v0.29.9 sigs.k8s.io/controller-runtime v0.17.6 @@ -56,7 +56,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.29.2 // indirect k8s.io/client-go v0.29.9 // indirect - k8s.io/component-base v0.29.2 // indirect + k8s.io/component-base v0.29.9 // 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-20240711033017-18e509b52bc8 // indirect diff --git a/api/go.sum b/api/go.sum index 4c677091..87abae0f 100644 --- a/api/go.sum +++ b/api/go.sum @@ -7,8 +7,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= @@ -72,10 +72,10 @@ github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= -github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe h1:2Zho501nm4xAbQLlt0LaJwdWCqulf94coU55+bKaExw= -github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:+lR2e0WZFsV+cS5RLvyqr+Tm8XSi2XZKXpS2tSauyqA= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe h1:/lQa5/Z8DzQjI5knyjpeRhIMyOMIuWptEV3uqR8lKH4= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:KRXgTWy1+0RC8hlScq6uShXovg4Kf8HHBJqUuhFFvTo= +github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283 h1:9ny4ndmqCQwd+6UTvNbl0RIUozAeMoMjmjS4cCGOP4U= +github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:3JoOAuMiQYhNcXUipvOhx9mmGnQ3owRwORoxqjFFmS8= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283 h1:iBMqDt1F5yqdIGDRbBB0rrw5dhdBj7Lx3ZbLxQI85oI= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:cGynoLGY9NfyIeWXI3zZ+hgZdHF3SUi8ht5ygZ8CmhI= 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= @@ -186,8 +186,8 @@ k8s.io/apimachinery v0.29.9 h1:YZ8HUid1TzQVz94cnNlsQjLdH0VoAhWSqz7t0q6B12A= k8s.io/apimachinery v0.29.9/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= k8s.io/client-go v0.29.9 h1:4f/Wz6li3rEyIPFj32XAQMtOGMM1tg7KQi1oeS6ibPg= k8s.io/client-go v0.29.9/go.mod h1:2N1drQEZ5yiYrWVaE2Un8JiISUhl47D8pyZlYLszke4= -k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= -k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= +k8s.io/component-base v0.29.9 h1:lPENvp3CCwdeMEWGjiTfn5b287qQYuK7gX32OBOovmA= +k8s.io/component-base v0.29.9/go.mod h1:NGDa6Ih0EdcLA2G4K2ZYySoiB+2Tn+rmSqPyudCPgDY= 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= diff --git a/go.mod b/go.mod index 4c214599..bfa62eaa 100644 --- a/go.mod +++ b/go.mod @@ -6,13 +6,13 @@ require ( github.com/go-logr/logr v1.4.2 github.com/onsi/ginkgo/v2 v2.20.1 github.com/onsi/gomega v1.34.1 - github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240917142819-7e2d29023d36 - github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240916074020-1104df97c4dc - github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe - github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe - github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240916063644-814ac3823abe + github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240924160156-ab5ffca21875 + github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240924153427-7c76cf130db3 + github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283 + github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283 + github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240925091112-d0fa8e528283 github.com/openstack-k8s-operators/manila-operator/api v0.0.0-00010101000000-000000000000 - github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240913150207-a06f656e440b + github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240924182844-b6e2e51b497f k8s.io/api v0.29.9 k8s.io/apimachinery v0.29.9 k8s.io/client-go v0.29.9 @@ -69,7 +69,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.29.2 // indirect - k8s.io/component-base v0.29.2 // indirect + k8s.io/component-base v0.29.9 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -81,7 +81,7 @@ require ( github.com/google/uuid v1.6.0 github.com/imdario/mergo v0.3.16 //indirect github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 - github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240916063644-814ac3823abe // indirect + github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240925091112-d0fa8e528283 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 ) diff --git a/go.sum b/go.sum index ce795fe6..b7c2b9a4 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= @@ -77,20 +77,20 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E= github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4= -github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240917142819-7e2d29023d36 h1:CLWZvSjPEmdJNSUrpcgLRb1UOP2LBGJrwm+8LlCx/FA= -github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240917142819-7e2d29023d36/go.mod h1:TFh01OyR/NP5Sy7vikMIpQc80AKl0WWPyYDaJBfFiGc= -github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240916074020-1104df97c4dc h1:KgWJ/H/8S5VUkOTPySmx81BY/vxE6YeKPZO0O+o9DVc= -github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240916074020-1104df97c4dc/go.mod h1:VZncfdJsl6TYboKql4Jl2a17qzWRB/JRlpmMwIkctR8= -github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe h1:2Zho501nm4xAbQLlt0LaJwdWCqulf94coU55+bKaExw= -github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:+lR2e0WZFsV+cS5RLvyqr+Tm8XSi2XZKXpS2tSauyqA= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240916063644-814ac3823abe h1:0m6LKu/Wi8jHdcXS90bpZ4jZhEe8M6zLpE3aGlqkxh4= -github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:aq7uFyHuTbjupIIYZBdmTgJqExQ59f1Lpwj6itCWOkI= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe h1:/lQa5/Z8DzQjI5knyjpeRhIMyOMIuWptEV3uqR8lKH4= -github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:KRXgTWy1+0RC8hlScq6uShXovg4Kf8HHBJqUuhFFvTo= -github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240916063644-814ac3823abe h1:lkcyfF/SZFHPq1hQ48PPk3GpbeoTxmpOQXc3OwK3bS8= -github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240916063644-814ac3823abe/go.mod h1:4nAAsXvcEdAK8YxF7cQpe1JvZoSuyDHai9gyOBFJ/eo= -github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240913150207-a06f656e440b h1:BoMWmo2gvOO1yRlHLHmEDzYSmOW/lgNXO6x8DCVe7s4= -github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240913150207-a06f656e440b/go.mod h1:nu9jPHDKVIrsU2GnrCXH/iW+qf0c3wKwJcHs7zJhK6s= +github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240924160156-ab5ffca21875 h1:v3SfouEb+3QvNHLVyxeHI+cu/rF5pz/2swmtK2k9nq0= +github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240924160156-ab5ffca21875/go.mod h1:oBcxbPrvghn8TTNV4YbPhsOuhWk1qMZcvzaq86UOOyU= +github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240924153427-7c76cf130db3 h1:BSbRjtJNXEVe3/FsH4enYXM5tR3AelCY9APl9yaD3ko= +github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240924153427-7c76cf130db3/go.mod h1:M4gh5AiCKc7GCRqky6SEQ6JYBYNXtFg+4HdPeGX2NUI= +github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283 h1:9ny4ndmqCQwd+6UTvNbl0RIUozAeMoMjmjS4cCGOP4U= +github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:3JoOAuMiQYhNcXUipvOhx9mmGnQ3owRwORoxqjFFmS8= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240925091112-d0fa8e528283 h1:b0sh2qFCXOdRRGVlTd0q5YcTBRlLz9gsJrxZuyD1Fy0= +github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:t4Bbcsmzn1Z/0TlAN6Tsr3NXsB7M7EX5bCszfPSXZq4= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283 h1:iBMqDt1F5yqdIGDRbBB0rrw5dhdBj7Lx3ZbLxQI85oI= +github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:cGynoLGY9NfyIeWXI3zZ+hgZdHF3SUi8ht5ygZ8CmhI= +github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240925091112-d0fa8e528283 h1:tOltAleFLxk3d7Ia8ktGGxCtVIrqqUTUfx/tcfE/zq4= +github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240925091112-d0fa8e528283/go.mod h1:LV0jo5etIsGyINpmB37i4oWR8zU6ApIuh7fsqGGA41o= +github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240924182844-b6e2e51b497f h1:qIesjGJguULhx3FwoGZTjw7vFaoARgr2tRxEGl1gSYw= +github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240924182844-b6e2e51b497f/go.mod h1:VE/rDM9SH7GSs7zy32sYt9JWgjnUc212VZmgUCL3b1U= 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= @@ -207,8 +207,8 @@ k8s.io/apimachinery v0.29.9 h1:YZ8HUid1TzQVz94cnNlsQjLdH0VoAhWSqz7t0q6B12A= k8s.io/apimachinery v0.29.9/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= k8s.io/client-go v0.29.9 h1:4f/Wz6li3rEyIPFj32XAQMtOGMM1tg7KQi1oeS6ibPg= k8s.io/client-go v0.29.9/go.mod h1:2N1drQEZ5yiYrWVaE2Un8JiISUhl47D8pyZlYLszke4= -k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= -k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= +k8s.io/component-base v0.29.9 h1:lPENvp3CCwdeMEWGjiTfn5b287qQYuK7gX32OBOovmA= +k8s.io/component-base v0.29.9/go.mod h1:NGDa6Ih0EdcLA2G4K2ZYySoiB+2Tn+rmSqPyudCPgDY= 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=