Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes/api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.25.11
Choose a base ref
...
head repository: kubernetes/api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.25.12
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 22, 2023

  1. don't process unsupported loadbalancers with mixed protocols 

    Mixed protocols were not supported in GCE loadbalancers for old
versions, so we should fail to avoid confusions on users.

Ref: k8s.io/cloud-provider-gcp#475
Change-Id: I5fbd5230afbc51d595cacc96b3fa86473a3eb131

Kubernetes-commit: f86b911ab0ead1ef5773c21803643dcefc05e130
    @aojea @k8s-publishing-bot
    aojea authored and k8s-publishing-bot committed Feb 22, 2023
    Copy the full SHA
    0936de3 View commit details

Commits on Feb 28, 2023

  1. make MixedProtocolNotSupported public 

    Change-Id: Ib9f5ea8e36c831cd0e9649aa998c96f61d56122d

Kubernetes-commit: 8964b6285473303e983b9d13183bb2834d6736ca
    @aojea @k8s-publishing-bot
    aojea authored and k8s-publishing-bot committed Feb 28, 2023
    Copy the full SHA
    c408085 View commit details

Commits on Jul 11, 2023

  1. Merge pull request #116668 from aojea/automated-cherry-pick-of-#11596… 

    …6-upstream-release-1.25

Automated cherry pick of #115966: make MixedProtocolNotSupported public

Kubernetes-commit: 475ef0549f8a5c39d25a84894529db0c34e7cf7f
    @k8s-publishing-bot
    k8s-publishing-bot committed Jul 11, 2023
    Copy the full SHA
    01e0753 View commit details

Commits on Jul 19, 2023

  1. Update dependencies to v0.25.12 tag

    @k8s-publishing-bot
    k8s-publishing-bot committed Jul 19, 2023
    Copy the full SHA
    9f97082 View commit details
Showing with 14 additions and 4 deletions.
  1. +10 −0 core/v1/types.go
  2. +2 −2 go.mod
  3. +2 −2 go.sum
10 changes: 10 additions & 0 deletions core/v1/types.go
View file
Original file line number Diff line number Diff line change
@@ -4267,6 +4267,9 @@ const (
// LoadBalancerPortsError represents the condition of the requested ports
// on the cloud load balancer instance.
LoadBalancerPortsError = "LoadBalancerPortsError"
// LoadBalancerPortsErrorReason reason in ServiceStatus condition LoadBalancerPortsError
// means the LoadBalancer was not able to be configured correctly.
LoadBalancerPortsErrorReason = "LoadBalancerMixedProtocolNotSupported"
)

// ServiceStatus represents the current status of a service.
@@ -6625,6 +6628,13 @@ const (
PortForwardRequestIDHeader = "requestID"
)

const (
// MixedProtocolNotSupported error in PortStatus means that the cloud provider
// can't publish the port on the load balancer because mixed values of protocols
// on the same LoadBalancer type of Service are not supported by the cloud provider.
MixedProtocolNotSupported = "MixedProtocolNotSupported"
)

// PortStatus represents the error condition of a service port

type PortStatus struct {
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ go 1.19
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.0
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
k8s.io/apimachinery v0.25.12
)

require (
@@ -34,4 +34,4 @@ require (
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b
replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.12
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -83,8 +83,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b h1:co64EPN9U3r8pUMoJQrS1usYRhkmJTPCYA8iquh5Hh4=
k8s.io/apimachinery v0.0.0-20230612170954-99ba49d7333b/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc=
k8s.io/apimachinery v0.25.12 h1:xLVMeHrUfO4Eq2CK60YS+ElVYv0AUNSGVYdHKZFBHRE=
k8s.io/apimachinery v0.25.12/go.mod h1:IFwbcNi3gKkfDhuy0VYu3+BwbxbiIov3p6FR8ge1Epc=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=