From 5766c5a4a4bb8faede4914ee76e8c3d07894541a Mon Sep 17 00:00:00 2001 From: Roberto Alfieri Date: Thu, 6 Apr 2023 09:40:19 +0200 Subject: [PATCH 1/2] upgrade of dataplane-operator with last patches Signed-off-by: Roberto Alfieri --- apis/go.mod | 2 ++ apis/go.sum | 2 ++ go.mod | 2 +- go.sum | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apis/go.mod b/apis/go.mod index 7b9a4b34..2f623240 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -20,6 +20,8 @@ require ( sigs.k8s.io/controller-runtime v0.14.6 ) +require github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 // indirect + require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/apis/go.sum b/apis/go.sum index 9482bfa5..56585c1e 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -225,6 +225,8 @@ github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDD github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7 h1:Wo8vj4UlgoymM1MBWECYLsNSNOzAob5Y9+1nbX6+CPA= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7/go.mod h1:C8JLjUevPjh1Sx7tud8T0lQQAVsD3oUTtA3EsQeSeyk= +github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 h1:Bd3tClozfJlVlvIQeyT/m0ZhB9zMZd6wXudLycAL5yE= +github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8 h1:5Wg+klmmD+8N11DMP3uBsbtbS0OhY1dC0BVfCH0k/9I= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8/go.mod h1:z3v2z9WNJUpPvA+8T+EY/igLfGb09xlgd/u9Brm0h/o= github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230324141445-d1ac945900ed h1:BEsn3dxvwK8cy+3GGhy0JHFSwhhnSR1B9zpYan0Llkk= diff --git a/go.mod b/go.mod index 14bf7764..aef691b2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/logr v1.2.4 github.com/imdario/mergo v0.3.15 github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7 - github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230404002449-ec04b043b750 + github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8 github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230324141445-d1ac945900ed github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230404074453-a45327c3502f diff --git a/go.sum b/go.sum index 4925e989..03768e5c 100644 --- a/go.sum +++ b/go.sum @@ -234,6 +234,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7/go.mod h1:C8JLjUevPjh1Sx7tud8T0lQQAVsD3oUTtA3EsQeSeyk= github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230404002449-ec04b043b750 h1:1LFmwqSvk0cmAXslxIPLpJ/3JsaZvcbe+WDUDFWnfdM= github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230404002449-ec04b043b750/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= +github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 h1:Bd3tClozfJlVlvIQeyT/m0ZhB9zMZd6wXudLycAL5yE= +github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8 h1:5Wg+klmmD+8N11DMP3uBsbtbS0OhY1dC0BVfCH0k/9I= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8/go.mod h1:z3v2z9WNJUpPvA+8T+EY/igLfGb09xlgd/u9Brm0h/o= github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230324141445-d1ac945900ed h1:BEsn3dxvwK8cy+3GGhy0JHFSwhhnSR1B9zpYan0Llkk= From 4d96bd72fa6881b377c7cf6cbc6db1f4d91fc783 Mon Sep 17 00:00:00 2001 From: Roberto Alfieri Date: Thu, 6 Apr 2023 10:29:56 +0200 Subject: [PATCH 2/2] removed not used reference to dataplane-operator in apis/go.mod Signed-off-by: Roberto Alfieri --- apis/go.mod | 2 -- apis/go.sum | 2 -- go.sum | 2 -- 3 files changed, 6 deletions(-) diff --git a/apis/go.mod b/apis/go.mod index 2f623240..7b9a4b34 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -20,8 +20,6 @@ require ( sigs.k8s.io/controller-runtime v0.14.6 ) -require github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 // indirect - require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/apis/go.sum b/apis/go.sum index 56585c1e..9482bfa5 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -225,8 +225,6 @@ github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDD github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7 h1:Wo8vj4UlgoymM1MBWECYLsNSNOzAob5Y9+1nbX6+CPA= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7/go.mod h1:C8JLjUevPjh1Sx7tud8T0lQQAVsD3oUTtA3EsQeSeyk= -github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 h1:Bd3tClozfJlVlvIQeyT/m0ZhB9zMZd6wXudLycAL5yE= -github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8 h1:5Wg+klmmD+8N11DMP3uBsbtbS0OhY1dC0BVfCH0k/9I= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8/go.mod h1:z3v2z9WNJUpPvA+8T+EY/igLfGb09xlgd/u9Brm0h/o= github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230324141445-d1ac945900ed h1:BEsn3dxvwK8cy+3GGhy0JHFSwhhnSR1B9zpYan0Llkk= diff --git a/go.sum b/go.sum index 03768e5c..341dc295 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,6 @@ github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDD github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7 h1:Wo8vj4UlgoymM1MBWECYLsNSNOzAob5Y9+1nbX6+CPA= github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230404123906-31a141ed31a7/go.mod h1:C8JLjUevPjh1Sx7tud8T0lQQAVsD3oUTtA3EsQeSeyk= -github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230404002449-ec04b043b750 h1:1LFmwqSvk0cmAXslxIPLpJ/3JsaZvcbe+WDUDFWnfdM= -github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230404002449-ec04b043b750/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355 h1:Bd3tClozfJlVlvIQeyT/m0ZhB9zMZd6wXudLycAL5yE= github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230405165408-74539cecf355/go.mod h1:iMH2Z28HLalGVSxBg58osCjCeafdx9HJctq8ec31csw= github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230404134424-48d1d0cc1ce8 h1:5Wg+klmmD+8N11DMP3uBsbtbS0OhY1dC0BVfCH0k/9I=