From f6ae79147d587d403eac6d7759f5b0ec7aadcfef Mon Sep 17 00:00:00 2001 From: openstack-k8s-operators-ci Date: Sat, 24 Oct 2026 06:02:03 +0000 Subject: [PATCH] Update openstack-k8s-operators (main) --- .../ovn.openstack.org_ovndbclusters.yaml | 41 ++++++++++++++++++- api/go.mod | 4 +- api/go.sum | 8 ++-- .../ovn.openstack.org_ovndbclusters.yaml | 41 ++++++++++++++++++- go.mod | 6 +-- go.sum | 12 +++--- 6 files changed, 93 insertions(+), 19 deletions(-) diff --git a/api/bases/ovn.openstack.org_ovndbclusters.yaml b/api/bases/ovn.openstack.org_ovndbclusters.yaml index 75c312ad..7607531c 100644 --- a/api/bases/ovn.openstack.org_ovndbclusters.yaml +++ b/api/bases/ovn.openstack.org_ovndbclusters.yaml @@ -150,8 +150,8 @@ spec: spec: description: |- OverrideServiceSpec is a subset of the fields included in https://pkg.go.dev/k8s.io/api@v0.26.6/core/v1#ServiceSpec - Limited to Type, SessionAffinity, LoadBalancerSourceRanges, ExternalName, ExternalTrafficPolicy, SessionAffinityConfig, - IPFamilyPolicy, LoadBalancerClass and InternalTrafficPolicy + Limited to Type, Ports, SessionAffinity, LoadBalancerSourceRanges, ExternalName, ExternalTrafficPolicy, + SessionAffinityConfig, IPFamilyPolicy, LoadBalancerClass and InternalTrafficPolicy properties: externalName: description: |- @@ -219,6 +219,43 @@ spec: type: string type: array x-kubernetes-list-type: atomic + ports: + description: |- + Ports overrides the Port number of existing generated Service ports, + matched by Name. Each entry changes only the Port of the base port with the + same Name; TargetPort and every other field are preserved from the base + port, so overriding the exposed port never changes backend routing. An + entry whose Name does not match any base port is rejected. + + The intended use is placing several Services on a single shared + LoadBalancer IP by changing their Port values. To leave a Service's ports + untouched, omit this field entirely. + items: + description: |- + OverrideServicePort overrides the Port number of a generated Service port, + identified by Name. Only the Port can be changed: TargetPort and every other + field are preserved from the matched base port, so overriding the exposed port + never changes backend routing. This deliberately exposes a smaller surface + than the upstream corev1.ServicePort, which would allow changing TargetPort + (and other fields) and silently break the deployment connection. + properties: + name: + description: |- + Name of the base Service port to override. It must match the Name of an + existing port on the generated Service. + type: string + port: + description: Port is the new Service port number. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - name + - port + type: object + type: array + x-kubernetes-list-type: atomic sessionAffinity: description: |- Supports "ClientIP" and "None". Used to maintain session affinity. diff --git a/api/go.mod b/api/go.mod index a319bd01..a2e1fcf6 100644 --- a/api/go.mod +++ b/api/go.mod @@ -6,8 +6,8 @@ require ( github.com/go-logr/logr v1.4.4 github.com/google/uuid v1.6.0 github.com/onsi/gomega v1.44.0 - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4 - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30 + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178 k8s.io/api v0.33.13 k8s.io/apimachinery v0.33.13 sigs.k8s.io/controller-runtime v0.21.0 diff --git a/api/go.sum b/api/go.sum index cf6c16ad..43a81309 100644 --- a/api/go.sum +++ b/api/go.sum @@ -81,10 +81,10 @@ github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ= github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 h1:YVY7Mb0AdJBbNgC/Zz9R/ZwhixOmZNA8P+6ZPaDW/0M= github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4 h1:VKjAytsekDNuFDNGEibl0mqnQ+N+xbMGSWP/nr7oREU= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4/go.mod h1:TrIs6lhDmo8SxnoOp+tlvVRLUyPMjhwMotBwK1Yjgf8= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f h1:YBO4fc+f6pmxDLEiQ7Ec1Qii992uKD2DCIWdPcg+iec= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f/go.mod h1:q0N2DU1KwZT+Iez34wwkESeHKHN5pbda8G0Gg2QRWNE= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30 h1:M/W7y41YPX5JF/DU00R3gkpSdxAakiLos/wxTs42mv4= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30/go.mod h1:nJGNsxkzWE6tqooS51hmc7Nqrwvznq0e3ZNITA6IJOY= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178 h1:yQGzRZq9/BI/VoCCWM8aQiPGlMYOUAAGK98wL2la8FA= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178/go.mod h1:q0N2DU1KwZT+Iez34wwkESeHKHN5pbda8G0Gg2QRWNE= 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= diff --git a/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml b/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml index 75c312ad..7607531c 100644 --- a/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml +++ b/config/crd/bases/ovn.openstack.org_ovndbclusters.yaml @@ -150,8 +150,8 @@ spec: spec: description: |- OverrideServiceSpec is a subset of the fields included in https://pkg.go.dev/k8s.io/api@v0.26.6/core/v1#ServiceSpec - Limited to Type, SessionAffinity, LoadBalancerSourceRanges, ExternalName, ExternalTrafficPolicy, SessionAffinityConfig, - IPFamilyPolicy, LoadBalancerClass and InternalTrafficPolicy + Limited to Type, Ports, SessionAffinity, LoadBalancerSourceRanges, ExternalName, ExternalTrafficPolicy, + SessionAffinityConfig, IPFamilyPolicy, LoadBalancerClass and InternalTrafficPolicy properties: externalName: description: |- @@ -219,6 +219,43 @@ spec: type: string type: array x-kubernetes-list-type: atomic + ports: + description: |- + Ports overrides the Port number of existing generated Service ports, + matched by Name. Each entry changes only the Port of the base port with the + same Name; TargetPort and every other field are preserved from the base + port, so overriding the exposed port never changes backend routing. An + entry whose Name does not match any base port is rejected. + + The intended use is placing several Services on a single shared + LoadBalancer IP by changing their Port values. To leave a Service's ports + untouched, omit this field entirely. + items: + description: |- + OverrideServicePort overrides the Port number of a generated Service port, + identified by Name. Only the Port can be changed: TargetPort and every other + field are preserved from the matched base port, so overriding the exposed port + never changes backend routing. This deliberately exposes a smaller surface + than the upstream corev1.ServicePort, which would allow changing TargetPort + (and other fields) and silently break the deployment connection. + properties: + name: + description: |- + Name of the base Service port to override. It must match the Name of an + existing port on the generated Service. + type: string + port: + description: Port is the new Service port number. + format: int32 + maximum: 65535 + minimum: 1 + type: integer + required: + - name + - port + type: object + type: array + x-kubernetes-list-type: atomic sessionAffinity: description: |- Supports "ClientIP" and "None". Used to maintain session affinity. diff --git a/go.mod b/go.mod index c49a1c7d..da74ad0e 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7 github.com/onsi/ginkgo/v2 v2.33.1 github.com/onsi/gomega v1.44.0 - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4 - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f - github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261013151427-9b94821abb9f + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30 + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178 + github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261023124652-eebd8803b178 github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230418071801-b5843d9e05fb golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 k8s.io/api v0.33.13 diff --git a/go.sum b/go.sum index e7d47dcf..a863debb 100644 --- a/go.sum +++ b/go.sum @@ -114,12 +114,12 @@ github.com/onsi/gomega v1.44.0 h1:eAiGl3Pw5jz5GQdDff0BcxYpAX1JxW8xD7mFUuwNfZQ= github.com/onsi/gomega v1.44.0/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA= github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 h1:YVY7Mb0AdJBbNgC/Zz9R/ZwhixOmZNA8P+6ZPaDW/0M= github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4 h1:VKjAytsekDNuFDNGEibl0mqnQ+N+xbMGSWP/nr7oREU= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261012081708-7aa3021e95e4/go.mod h1:TrIs6lhDmo8SxnoOp+tlvVRLUyPMjhwMotBwK1Yjgf8= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f h1:YBO4fc+f6pmxDLEiQ7Ec1Qii992uKD2DCIWdPcg+iec= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261013151427-9b94821abb9f/go.mod h1:q0N2DU1KwZT+Iez34wwkESeHKHN5pbda8G0Gg2QRWNE= -github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261013151427-9b94821abb9f h1:kWWvh2ohxgChzjnCIDb8rUQ2rVjci5CH1JPg22BpoT0= -github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261013151427-9b94821abb9f/go.mod h1:enei+rhzWgyEqqcrh/1V42M9exsotXPnmsj48g1nqD0= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30 h1:M/W7y41YPX5JF/DU00R3gkpSdxAakiLos/wxTs42mv4= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20261019104913-82fa8b3c2e30/go.mod h1:nJGNsxkzWE6tqooS51hmc7Nqrwvznq0e3ZNITA6IJOY= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178 h1:yQGzRZq9/BI/VoCCWM8aQiPGlMYOUAAGK98wL2la8FA= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20261023124652-eebd8803b178/go.mod h1:q0N2DU1KwZT+Iez34wwkESeHKHN5pbda8G0Gg2QRWNE= +github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261023124652-eebd8803b178 h1:MwYTaMDu4ootaADyaTJh9xWQecA4vct1nbTQ4okOylE= +github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20261023124652-eebd8803b178/go.mod h1:enei+rhzWgyEqqcrh/1V42M9exsotXPnmsj48g1nqD0= 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=