Merge branch 'main' into octavia-ovn-certs

openstack-k8s-operators · Apr 17, 2024 · a8f7437 · a8f7437
2 parents bfd3eed + a310457
commit a8f7437
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 143 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -10621,10 +10621,6 @@ spec:
                           persistenceDatabaseAccount:
                             default: octavia-persistence
                             type: string
-                          redisHostIPs:
-                            items:
-                              type: string
-                            type: array
                           resources:
                             properties:
                               claims:
@@ -10747,10 +10743,6 @@ spec:
                           persistenceDatabaseAccount:
                             default: octavia-persistence
                             type: string
-                          redisHostIPs:
-                            items:
-                              type: string
-                            type: array
                           resources:
                             properties:
                               claims:
@@ -10873,10 +10865,6 @@ spec:
                           persistenceDatabaseAccount:
                             default: octavia-persistence
                             type: string
-                          redisHostIPs:
-                            items:
-                              type: string
-                            type: array
                           resources:
                             properties:
                               claims:
@@ -16252,9 +16240,6 @@ spec:
                                 additionalProperties:
                                   type: string
                                 type: object
-                              memcachedInstance:
-                                default: memcached
-                                type: string
                               networkAttachmentDefinitions:
                                 items:
                                   type: string
@@ -16352,7 +16337,6 @@ spec:
                                 type: object
                             required:
                             - databaseInstance
-                            - memcachedInstance
                             - secret
                             type: object
                           enabled:

diff --git a/apis/go.mod b/apis/go.mod
@@ -8,30 +8,30 @@ require (
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240401125932-8d6162aed60d
 	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240414121754-6b5994d3fe94
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c
-	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240411120107-bc969613d25f
-	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240416153311-676f29fe01fc
+	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297
+	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240416110212-8e29e92d6abe
+	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240415130507-82a16975e68f
 	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47
-	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240412212552-850399d0605c
+	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240416095331-1e9d3e38a854
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240412091425-bb628ded5eb8
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240412091425-bb628ded5eb8
 	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-74e2f3cc4015
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240411120933-2fa11969312b
-	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415072306-b848abde3433
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416115956-468bde1c9db2
-	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240412212308-52c4fc7de5a4
+	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0
+	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415184904-3cb51bb705ab
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416144718-c09414bd100d
+	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a
 	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240412224825-4de3d73ff582
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240411074805-079ca1366960
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240416123317-6a3fd6f6dbc9
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a
 	github.com/rabbitmq/cluster-operator/v2 v2.6.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect
 	github.com/rhobs/observability-operator v0.0.28 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	k8s.io/api v0.28.8
 	k8s.io/apimachinery v0.28.8
 	k8s.io/client-go v0.28.8
@@ -76,10 +76,10 @@ require (
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

diff --git a/apis/go.sum b/apis/go.sum
@@ -79,18 +79,18 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240401190259-4d30fdbf5531/go.mod h1:ayvrE0oMzyA/AQDKpCqNT9uupRT0TqrSFXb1sjmvWqE=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767 h1:He5McazPpzOM00VkSpwK85oUq5JMHdjT8o26HxwQamc=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240403153039-29d27af23767/go.mod h1:SHv9v0wscyVv0yT3VD2UuPvw+kwRAEX/x/8fbnfZVpo=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240414121754-6b5994d3fe94 h1:XvyrklpMvwNzoYcs9LAYuKxEIURrH3k1kE5GgWfOi5Y=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240414121754-6b5994d3fe94/go.mod h1:AzqqIiq14lQOlnKZEShUbwIqqUtdj+KM2hhnoYE892A=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c h1:0hlIFxElsqUwMBjcmuRqvHv0McJLigywLFVSch0viSI=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240411002819-b89de06edd7c/go.mod h1:oSvJ8bh9YouPoawJ9UaXXdg2vJuMn1frHfsZCXtYFuo=
-github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240411120107-bc969613d25f h1:ZfI8OCG1e/5sdB4CZJU8YI4G75cepklAI0yVNVoe8EM=
-github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240411120107-bc969613d25f/go.mod h1:/qJz+SyeRDEcjwoGYBKb7DdYIWm5lUaCbpkaHnMhrwc=
-github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8 h1:0uZLjBDtSXUaRhnHsjLqhGm/Cv7BN2v7T3Z5v/T3ndc=
-github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240409161822-d0ab878db2d8/go.mod h1:ii0O3I9B+mkX6/D8qDQjg/q76sojufkYhM7bq7qo41E=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240416153311-676f29fe01fc h1:6moslPDpEtE+reqbjtVUh5ZRcmqJfABVW2jqZGwbUbw=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240416153311-676f29fe01fc/go.mod h1:iF3kJKcUI+qmVJWwhkL9tL6eTfLkZaGA22UYr5uDGXU=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297 h1:BUV0fw1BemZVfdctYxFkJuq8Qp/r4AT6bDFbUSOGFl0=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240416110211-aaba96840297/go.mod h1:5s80kwHvLfdkYDBt0LoPyle1260XlsZZBOI8obhAYhY=
+github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240416110212-8e29e92d6abe h1:IJkJdsTnTKrkQ2MJDNP4qntpG2yXaCHTkFI+4CHvvLo=
+github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240416110212-8e29e92d6abe/go.mod h1:WW4WSsJs7u1fD9G/o9PQcXXVKLUmW4DwY6XJRinoBsw=
+github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240415130507-82a16975e68f h1:BnUTBvSrBlF61qoj3p7tgjTYTrvGC1Tt7RlZoWOAqfY=
+github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240415130507-82a16975e68f/go.mod h1:CLzUBOsKBL7Oeq0Aloubq3NsQ61YDQ063Okub1Ze3A4=
 github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47 h1:uAvsVOH8a+u8ulgQ9EnjGP5TPtE2brHnYSQ4U/YI5AU=
 github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240408054123-cb7b79a22b47/go.mod h1:qu/Kuk0zZNbdyAPCF1m+Amp9mU37ol2LyB+1Rvws948=
-github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240412212552-850399d0605c h1:ZScbpp+/UVofPiGUN3udGwRTStNFi6h7C06paY1nS54=
-github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240412212552-850399d0605c/go.mod h1:opUQY0YZNCyA11FKLToVhaVZTTEMfbnf0ozOLmkKfGs=
+github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240416095331-1e9d3e38a854 h1:XbC7aITf9GQWBzMkRIaYaa9RO3gCWDzChUEmIohWk/M=
+github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240416095331-1e9d3e38a854/go.mod h1:opUQY0YZNCyA11FKLToVhaVZTTEMfbnf0ozOLmkKfGs=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240412091425-bb628ded5eb8 h1:5ywsORdn4y7vNO732ODwYlmfRXnEphfoqB6PCYWt9r8=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240412091425-bb628ded5eb8/go.mod h1:gqByVGUdKQB/NkhKV4eD+8NWYkHq961nC96rTCB3ywE=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240412091425-bb628ded5eb8 h1:G10lYr+UMHhorUH3npKpuNoFtNbGCyWwBP3RNpvO9nc=
@@ -101,22 +101,22 @@ github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-7
 github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240403143013-74e2f3cc4015/go.mod h1:2xtchrVN1qkQcO2Xa2JkQLqBdYL7GRIUUsoiGLHK3OM=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47 h1:cITh0IC0SvFFgkHE0jz4DJyfIh3L6D52yjx8sJaLC8g=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240411135034-a77c10351c47/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240411120933-2fa11969312b h1:alpIDaAYN2gtDoujW1lLj2Dy0/xp5ofvoNA4pX2yYXg=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240411120933-2fa11969312b/go.mod h1:iA/flM2a8U+wIT9QNC+mZxQsiebhOOlLv7qpCcHFrME=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415072306-b848abde3433 h1:YACRumvGLOC4qxE9Ew8BcQfx9lrpFEOxJhLcR1k99BI=
-github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415072306-b848abde3433/go.mod h1:VypWxGnIf++Ch2lG9AQYK1TmMkaInYGN56g6FEiKFv8=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416115956-468bde1c9db2 h1:VuFtvrkVPYztDwItMvo6K0pDBxXi2kSVMPiOD8nfC3E=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416115956-468bde1c9db2/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8=
-github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240412212308-52c4fc7de5a4 h1:3/lBXj0vyqaca2EakQZ8tA1koIrPZZeoJ2jwRoNYE/c=
-github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240412212308-52c4fc7de5a4/go.mod h1:geYtiRKn+GKR61YhAMsvPvLqVdMb4wtvMrj1kFG0SdU=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0 h1:oBRar195o+aDLQ/2UOxmTUljH7EZ2Eyl5h4dPa3Ld6k=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240416230751-051151b6f9e0/go.mod h1:1cceAi0KVrTEd9G0Gse8VypnNLPsyFWAIUcQ8KQhqvU=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415184904-3cb51bb705ab h1:6ZasTsRcZN7wNJzgr6emFiTJDPbnHHhdmq5Zj12PziE=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240415184904-3cb51bb705ab/go.mod h1:VypWxGnIf++Ch2lG9AQYK1TmMkaInYGN56g6FEiKFv8=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416144718-c09414bd100d h1:am8a7yGM6lYwxyo49PXnIXFdqaPY01sbdZU/RhD5f24=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240416144718-c09414bd100d/go.mod h1:EZymlUAhQzGNIAGrpGZ5P6oqfq2IhqY2lNPKLG9iKh8=
+github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a h1:DMc6a3vW2Hn51SflutJggKjWx1z1k49NcHkRsjieEs8=
+github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240415222517-eb816e08cb4a/go.mod h1:BUPvHv4+dcNNT50Kvkj9ae8FX9VBht8+7wtpiBWUbm0=
 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf h1:O7RzcKH3qRORucojkKZc1vIpQv5naYoWn34zhVzTs0E=
 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240404140050-69252e99daaf/go.mod h1:NYOgk2HS4mSR+4WwsiexepNU1pjxeo7h2WTs8qtS9/0=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240412224825-4de3d73ff582 h1:4SESCRIZGCcbSed90lRzfvQoIUjpgwjfs3tOpTtDr88=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240412224825-4de3d73ff582/go.mod h1:bhh994o69xj+ZkYGMEfxXMgkv/Va28Td+RDTqQqbbLY=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240411074805-079ca1366960 h1:jrlHiPFI/sMWOMDGSFOsBms1RxI98R5VXJbDf6bnjj8=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240411074805-079ca1366960/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240416123317-6a3fd6f6dbc9 h1:EkbfdE66Ky7AdYNG/kUJKBef5iIexO1TmdjZOGWsFlg=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240416123317-6a3fd6f6dbc9/go.mod h1:Jyxa9ZtVrXUQgDbuCl9mGWByF5duJ3LOWcLYIzMbrtc=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a h1:Yytw+duTXXuvzM60Qs9GvBOKJOapcxBGECLpsvGSCO8=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240417071438-ad7ce0d9da6a/go.mod h1:kiWsWO2Ue5w64gME1qbbdns/RdAI5kvR4DwXfM0nUHY=
 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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -155,8 +155,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
-golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc=
+golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -167,8 +167,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
 golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -183,12 +183,12 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
+golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -203,8 +203,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
+golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
+golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=