bump cloud-api-adaptor go modules and adjust

- update cloudmgr module import path
- build azure by default

Signed-off-by: Snir Sheriber <ssheribe@redhat.com>

Makefile

@@ -66,7 +66,7 @@ endif
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
-BUILTIN_CLOUD_PROVIDERS ?= aws
+BUILTIN_CLOUD_PROVIDERS ?= aws azure
 # Build tags required to build cloud-api-adaptor are derived from BUILTIN_CLOUD_PROVIDERS.
 space := $() $()
 comma := ,

go.mod

@@ -3,9 +3,9 @@ module github.com/openshift/sandboxed-containers-operator
 go 1.19
 
 require (
-	github.com/confidential-containers/cloud-api-adaptor v0.0.1-alpha.0.20230329054600-4aee262d04f9
-	github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230404000240-f0579b30f889
-	github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230404000240-f0579b30f889
+	github.com/confidential-containers/cloud-api-adaptor v0.5.0
+	github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230421161316-023f9af4cb76
+	github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230421161316-023f9af4cb76
 	github.com/coreos/ignition/v2 v2.9.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.2.3
@@ -32,7 +32,7 @@ require (
 	github.com/IBM/go-sdk-core/v5 v5.10.2 // indirect
 	github.com/IBM/vpc-go-sdk v0.32.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
-	github.com/avast/retry-go/v4 v4.3.2 // indirect
+	github.com/avast/retry-go/v4 v4.3.3 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.16.5 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.15.11 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.12.6 // indirect

go.sum

@@ -208,8 +208,8 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:W
 github.com/ashanbrown/forbidigo v1.2.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI=
 github.com/ashanbrown/makezero v0.0.0-20210520155254-b6261585ddde/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU=
 github.com/ashcrow/osrelease v0.0.0-20180626175927-9b292693c55c/go.mod h1:BRljTyotlu+6N+Qlu5MhjxpdmccCnp9lDvZjNNV8qr4=
-github.com/avast/retry-go/v4 v4.3.2 h1:x4sTEu3jSwr7zNjya8NTdIN+U88u/jtO/q3OupBoDtM=
-github.com/avast/retry-go/v4 v4.3.2/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU=
+github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w=
+github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
@@ -326,12 +326,12 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
-github.com/confidential-containers/cloud-api-adaptor v0.0.1-alpha.0.20230329054600-4aee262d04f9 h1:09qwZjjE2zA0Yru0MDPuaCE3ffMX38/w2gyuPqtITrE=
-github.com/confidential-containers/cloud-api-adaptor v0.0.1-alpha.0.20230329054600-4aee262d04f9/go.mod h1:IX0JMi9pRm9aBQbxdt0v4xE+Bo+Q6GigyyMw6BGjEcg=
-github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230404000240-f0579b30f889 h1:xRzk/jcsQhXmKjuDTiKNMVjcb20vQ6oDBdrE6hTDtOY=
-github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230404000240-f0579b30f889/go.mod h1:XgxEh0HseFqyriIUadvTLHReXvsldBoawvWwce9Uues=
-github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230404000240-f0579b30f889 h1:dDpb3E5euZYR7FTkmhhiZXTfmbKxxtyJJbOP8ViJcJk=
-github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230404000240-f0579b30f889/go.mod h1:LH9ur4GVe4uZM9MnQIGIeBr5CdCVMQ9AtUHGPs1WoD4=
+github.com/confidential-containers/cloud-api-adaptor v0.5.0 h1:CwbGKUzu13s27N1NiYeeqD+Odb3kDJnVpHQGAdu9a2c=
+github.com/confidential-containers/cloud-api-adaptor v0.5.0/go.mod h1:4809SseMTdYou/4+m5IGaCwqG628e+VPfkEleKtbzr8=
+github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230421161316-023f9af4cb76 h1:XXlOBMU7HOUINZxTID0UIDGoKYRKrTfPlzl+5gZdsoM=
+github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl v0.0.0-20230421161316-023f9af4cb76/go.mod h1:QcJcmlbhPuC61jW605HuiYWllIVV13n/nSqAFgvMX+E=
+github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230421161316-023f9af4cb76 h1:occ8yxFrifSXkGOpzy2Ub9pqCpeaMQO1a2nuqpnhDXY=
+github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl v0.0.0-20230421161316-023f9af4cb76/go.mod h1:LH9ur4GVe4uZM9MnQIGIeBr5CdCVMQ9AtUHGPs1WoD4=
 github.com/container-orchestrated-devices/container-device-interface v0.4.0/go.mod h1:E1zcucIkq9P3eyNmY+68dBQsTcsXJh9cgRo2IVNScKQ=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=

main.go

@@ -22,10 +22,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confidential-containers/cloud-api-adaptor/cmd/cloud-api-adaptor/cloudmgr"
 	peerpodcontrollers "github.com/confidential-containers/cloud-api-adaptor/peerpod-ctrl/controllers"
 	peerpodconfigcontrollers "github.com/confidential-containers/cloud-api-adaptor/peerpodconfig-ctrl/controllers"
 	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud"
+	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/cloudmgr"
 	secv1 "github.com/openshift/api/security/v1"
 	mcfgapi "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io"
 	"go.uber.org/zap/zapcore"