Update Subctl to v0.15.0-m2

Signed-off-by: Automated Release <release@submariner.io>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

go.mod

@@ -5,21 +5,21 @@ go 1.19
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0
-	github.com/coreos/go-semver v0.3.0
+	github.com/coreos/go-semver v0.3.1
 	github.com/gophercloud/utils v0.0.0-20210909165623-d7085207ff6d
 	github.com/mattn/go-isatty v0.0.17
 	github.com/onsi/ginkgo/v2 v2.7.0
-	github.com/onsi/gomega v1.24.2
+	github.com/onsi/gomega v1.25.0
 	github.com/openshift/api v0.0.0-20220414050251-a83e6f8f1d50
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
 	github.com/submariner-io/admiral v0.15.0-m2
-	github.com/submariner-io/cloud-prepare v0.15.0-m1.0.20230110161526-8f549fa74f40
-	github.com/submariner-io/lighthouse v0.15.0-m1.0.20230110164155-d5bf49cf2bed
+	github.com/submariner-io/cloud-prepare v0.15.0-m2
+	github.com/submariner-io/lighthouse v0.15.0-m2
 	github.com/submariner-io/shipyard v0.15.0-m2
-	github.com/submariner-io/submariner v0.15.0-m1.0.20230110143615-4ce887a6c8a9
-	github.com/submariner-io/submariner-operator v0.15.0-m1.0.20230110175926-f460f5456168
+	github.com/submariner-io/submariner v0.15.0-m2
+	github.com/submariner-io/submariner-operator v0.15.0-m2
 	github.com/uw-labs/lichen v0.1.7
 	golang.org/x/net v0.5.0
 	golang.org/x/oauth2 v0.4.0
@@ -49,7 +49,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.80.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect

go.sum

@@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 h1:5NbbMrIzmUn/TXFqAl
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21/go.mod h1:+Gxn8jYn5k9ebfHEqlhrMirFjSW0v0C9fI+KN5vk2kE=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 h1:KeTxcGdNnQudb46oOl4d90f2I33DF/c6q3RnZAmvQdQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28/go.mod h1:yRZVr/iT0AqyHeep00SZ4YfBAKojXz08w3XMBscdi0c=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0 h1:m6HYlpZlTWb9vHuuRHpWRieqPHWlS0mvQ90OJNrG/Nk=
-github.com/aws/aws-sdk-go-v2/service/ec2 v1.77.0/go.mod h1:mV0E7631M1eXdB+tlGFIw6JxfsC7Pz7+7Aw15oLVhZw=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.80.0 h1:3uXwe5AWlSqkvdkkYKOjzW6A+ZVfxfeRarCl4iU6WAo=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.80.0/go.mod h1:mV0E7631M1eXdB+tlGFIw6JxfsC7Pz7+7Aw15oLVhZw=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 h1:5C6XgTViSb0bunmU57b3CT+MhxULqHH2721FVA+/kDM=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21/go.mod h1:lRToEJsn+DRA9lW4O9L9+/3hjTkUzlzyzHqn8MTds5k=
 github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 h1:/2gzjhQowRLarkkBOGPXSRnb8sQ2RVsjdG1C/UliK/c=
@@ -98,8 +98,9 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
@@ -432,8 +433,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.24.2 h1:J/tulyYK6JwBldPViHJReihxxZ+22FHs0piGjQAvoUE=
-github.com/onsi/gomega v1.24.2/go.mod h1:gs3J10IS7Z7r7eXRoNJIrNqU4ToQukCJhFtKrWgHWnk=
+github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
+github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openshift/api v0.0.0-20220414050251-a83e6f8f1d50 h1:pg/cKeyO01QHvZNM8dvqVutf6shn+H1ZVPi83uyGil8=
 github.com/openshift/api v0.0.0-20220414050251-a83e6f8f1d50/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
 github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
@@ -520,16 +521,16 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/submariner-io/admiral v0.15.0-m2 h1:5xyFwjyd/1aCkAEd+E0sZIZdD9Z3L1uIkkLdZtu32ng=
 github.com/submariner-io/admiral v0.15.0-m2/go.mod h1:A939fnN3wDeKfrRSL+68mlUjRFvDj40bfGA+YQNlKSQ=
-github.com/submariner-io/cloud-prepare v0.15.0-m1.0.20230110161526-8f549fa74f40 h1:iYFASjdqKzu1bl8w9tEqBhi62uFSKI6QJuEE0HeP2LQ=
-github.com/submariner-io/cloud-prepare v0.15.0-m1.0.20230110161526-8f549fa74f40/go.mod h1:b4ZzVkcWLrJb+Dhd29ye75EvFoRWPUP5P5ABxKu3v8E=
-github.com/submariner-io/lighthouse v0.15.0-m1.0.20230110164155-d5bf49cf2bed h1:DwpYlf8vWxmjliS7MDRH7inN0YCeBndmvU+aXOcCIeE=
-github.com/submariner-io/lighthouse v0.15.0-m1.0.20230110164155-d5bf49cf2bed/go.mod h1:G4T0Mq/ak6nbaOPMQeZF8Fpa3CaVjyuxYL8eMFeCLRs=
+github.com/submariner-io/cloud-prepare v0.15.0-m2 h1:EODmGY993N5RDjRXv/7FDvb0v5daXGM1yWoyL8yW9BE=
+github.com/submariner-io/cloud-prepare v0.15.0-m2/go.mod h1:McX9g5raRYt2etf8QsmG8oeRsomxZe1He2voGoTMU8I=
+github.com/submariner-io/lighthouse v0.15.0-m2 h1:aTuWfPxYl+nkoI8SlMc9aMzW5o+4uLlLUgAOtctw8OI=
+github.com/submariner-io/lighthouse v0.15.0-m2/go.mod h1:ynQQHVkKt1Bve38QeApka+T/qO9nShjkfqrid/zK7Qo=
 github.com/submariner-io/shipyard v0.15.0-m2 h1:hua4aZq9bVKXSQ1M94wHlj8fWe0gFp7VI1xE8F1hCYE=
 github.com/submariner-io/shipyard v0.15.0-m2/go.mod h1:T5VGOaZPGE4/vtCScEcnRDB1RaglrOGGt/5d4MlWFJ8=
-github.com/submariner-io/submariner v0.15.0-m1.0.20230110143615-4ce887a6c8a9 h1:97i9GYdmCqNJiga67FiBY4ohoSeaQ2rqTJldwneNABk=
-github.com/submariner-io/submariner v0.15.0-m1.0.20230110143615-4ce887a6c8a9/go.mod h1:xziD0qCho8q/efXB11w5Gc9HBoelnok7cL5JSPd3AEg=
-github.com/submariner-io/submariner-operator v0.15.0-m1.0.20230110175926-f460f5456168 h1:CwtmHv+bRl+9GhTpam6V7spKV0TuaWbcyH++ARBFSP4=
-github.com/submariner-io/submariner-operator v0.15.0-m1.0.20230110175926-f460f5456168/go.mod h1:XdPd72i+lRi6Gyyz1LrAOq2AyzwMHxMgbtPox4/EDWM=
+github.com/submariner-io/submariner v0.15.0-m2 h1:W03Fehr1Nk73HbtLyRP+fqTi71TcQpIxEq7bD8qjGD4=
+github.com/submariner-io/submariner v0.15.0-m2/go.mod h1:IWzAIPhrfVcB7Dq8x/kYHj7lCSSSiKE2lj+hZBrkpcI=
+github.com/submariner-io/submariner-operator v0.15.0-m2 h1:3yCGsV7vt5seIvJI6fcY4DiduiVuI7dL2dBwa2jsTl8=
+github.com/submariner-io/submariner-operator v0.15.0-m2/go.mod h1:VeulQdkOzphI3evtjDDYj+RbOFfwZCztZRjT61l6/dM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=

pkg/diagnose/servicediscovery.go

@@ -85,7 +85,7 @@ func checkServiceExport(clusterInfo *cluster.Info, status reporter.Interface) {
 		epsList, err := ep.List(context.TODO(), metav1.ListOptions{
 			LabelSelector: labels.SelectorFromSet(map[string]string{
 				discovery.LabelManagedBy:          lhconstants.LabelValueManagedBy,
-				lhconstants.MCSLabelServiceName:   se.Name,
+				mcsv1a1.LabelServiceName:          se.Name,
 				lhconstants.MCSLabelSourceCluster: clusterInfo.Submariner.Spec.ClusterID,
 			}).String(),
 		})