github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-31 14:44:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102412 from andrewsykim/kill-service-topology

Browse Source 
Remove deprecated alpha Service topologyKeys field

Kubernetes-commit: 7ed2ed1b454fe8f09adf729c6cb814611634fea1
This commit is contained in:
Kubernetes Publisher
2021-06-04 10:48:38 -07:00
parent 742abf77bc cc4f429c89
commit ded678f91e
5 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@@ -480,7 +480,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "597d8a9937fd"
"Rev": "9f22d1265651"
},
{
"ImportPath": "k8s.io/apimachinery",

11
applyconfigurations/core/v1/servicespec.go
View File

@@ -39,7 +39,6 @@ type ServiceSpecApplyConfiguration struct {
HealthCheckNodePort *int32 `json:"healthCheckNodePort,omitempty"`
PublishNotReadyAddresses *bool `json:"publishNotReadyAddresses,omitempty"`
SessionAffinityConfig *SessionAffinityConfigApplyConfiguration `json:"sessionAffinityConfig,omitempty"`
TopologyKeys []string `json:"topologyKeys,omitempty"`
IPFamilies []corev1.IPFamily `json:"ipFamilies,omitempty"`
IPFamilyPolicy *corev1.IPFamilyPolicyType `json:"ipFamilyPolicy,omitempty"`
AllocateLoadBalancerNodePorts *bool `json:"allocateLoadBalancerNodePorts,omitempty"`
@@ -182,16 +181,6 @@ func (b *ServiceSpecApplyConfiguration) WithSessionAffinityConfig(value *Session
return b
}
// WithTopologyKeys adds the given value to the TopologyKeys field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the TopologyKeys field.
func (b *ServiceSpecApplyConfiguration) WithTopologyKeys(values ...string) *ServiceSpecApplyConfiguration {
for i := range values {
b.TopologyKeys = append(b.TopologyKeys, values[i])
}
return b
}
// WithIPFamilies adds the given value to the IPFamilies field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the IPFamilies field.

6
applyconfigurations/internal/internal.go
View File

@@ -6235,12 +6235,6 @@ var schemaYAML = typed.YAMLObject(`types:
- name: sessionAffinityConfig
type:
namedType: io.k8s.api.core.v1.SessionAffinityConfig
- name: topologyKeys
type:
list:
elementType:
scalar: string
elementRelationship: atomic
- name: type
type:
scalar: string

4
go.mod
View File

@@ -28,7 +28,7 @@ require (
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/protobuf v1.25.0
k8s.io/api v0.0.0-20210604114606-597d8a9937fd
k8s.io/api v0.0.0-20210604195109-9f22d1265651
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
k8s.io/klog/v2 v2.9.0
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
@@ -37,6 +37,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210604114606-597d8a9937fd
k8s.io/api => k8s.io/api v0.0.0-20210604195109-9f22d1265651
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
)

4
go.sum
View File

@@ -437,8 +437,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210604114606-597d8a9937fd h1:Zl0QbEdpIgO6ZWwL9Sp8I3VuMkmHZ74wNppSQMAPnTE=
k8s.io/api v0.0.0-20210604114606-597d8a9937fd/go.mod h1:Dc7D5FRyGPPWEZ/WG9X2TOU/beNMsO3+S+lU1bhmKwo=
k8s.io/api v0.0.0-20210604195109-9f22d1265651 h1:LFzzwgGgkcMv0WU00X6zFNZ6SvH6bt4XppbeBS4WVec=
k8s.io/api v0.0.0-20210604195109-9f22d1265651/go.mod h1:Dc7D5FRyGPPWEZ/WG9X2TOU/beNMsO3+S+lU1bhmKwo=
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f h1:DmoZH3nTdy0sXQ7iZ6Gd3b2DjLiCC8d2nWTLojwU7k4=
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f/go.mod h1:5zcgojGmAy5Bo3S4mgZWAt6HwoKzaSh4MV3ITvlcOVM=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=