Merge pull request #673 from bshephar/election-id

Unique LeaderElectionID
openstack-k8s-operators · Feb 15, 2024 · e426bf2 · e426bf2
2 parents 56156b3 + bd6aa0d
commit e426bf2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240214144842-5dcac51e5b36
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240214153913-80b4f87cfc2b
 	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.29.0
+	k8s.io/apimachinery v0.28.3
 	sigs.k8s.io/controller-runtime v0.16.4
 )
 

diff --git a/api/go.sum b/api/go.sum
@@ -175,8 +175,8 @@ k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
 k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
 k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08=
 k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc=
-k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
-k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
+k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
+k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
 k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
 k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
 k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI=

diff --git a/go.mod b/go.mod
@@ -11,19 +11,19 @@ require (
 	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0
 	github.com/onsi/ginkgo/v2 v2.14.0
 	github.com/onsi/gomega v1.30.0
-	github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20240213234314-66f0027c591b
+	github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-00010101000000-000000000000
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240214153927-179defb96a33
 	github.com/openstack-k8s-operators/lib-common/modules/ansible v0.3.1-0.20240214144842-5dcac51e5b36
 	github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20240214144842-5dcac51e5b36
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240214144842-5dcac51e5b36
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240214144842-5dcac51e5b36
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240214144842-5dcac51e5b36
-	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240214153858-9bf047b38c40
+	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240215092501-b87a395796d3
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240214153913-80b4f87cfc2b
 	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.28.3
-	k8s.io/apimachinery v0.29.0
+	k8s.io/apimachinery v0.28.3
 	k8s.io/client-go v0.28.3
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
 	sigs.k8s.io/controller-runtime v0.16.4

diff --git a/go.sum b/go.sum
@@ -90,8 +90,8 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.202402141
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240214144842-5dcac51e5b36/go.mod h1:sK82mkh2UzITsbNa/y6AKTZftHQnsYigqRx+rFbfZM4=
 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240214144842-5dcac51e5b36 h1:GXdro9f/BoLdkW1PxPlRs3e/47ml56UiJunjIO6uu3Q=
 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240214144842-5dcac51e5b36/go.mod h1:82nzS+DbBe1tzaMvNHH8FctmZzQ14ZAJysFGsMJiivo=
-github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240214153858-9bf047b38c40 h1:WGay9ZfY1qWYyuD65tW0IYu1qUW0nlXFLAEleRM6o8M=
-github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240214153858-9bf047b38c40/go.mod h1:VcXdIvXejw2kxuM6ookYlW46Ag/wrnXuNfGd2qIdwuk=
+github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240215092501-b87a395796d3 h1:Hi/PJDqjxmRhJbgYcNYGCqQfITOZf18JIkBYgRTUksc=
+github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240215092501-b87a395796d3/go.mod h1:QkQLZ/J9zBNk6ASWsWEonKPTcSiVJg7EEwrFxQQ6c/4=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240214153913-80b4f87cfc2b h1:PXOlMRrxePm9PP5amND90iJJzLvcJzgXmxqcA32wu1A=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240214153913-80b4f87cfc2b/go.mod h1:N/TGRRTMqxg+aJX/Zp9pyOhbpMnvRjFGYoej2DVHkws=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -200,8 +200,8 @@ k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
 k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
 k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08=
 k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc=
-k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o=
-k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
+k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
+k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
 k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
 k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
 k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI=

diff --git a/main.go b/main.go
@@ -107,7 +107,7 @@ func main() {
 		},
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "c8c223a1.openstack.org",
+		LeaderElectionID:       "e12e763d.openstack.org",
 		WebhookServer: webhook.NewServer(
 			webhook.Options{
 				Port:    9443,