kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #96311 from thockin/kep-1659-topology-labels 

Convert users of old failure-domain labels to new

Kubernetes-commit: 83b2c7a1bffd24ad8fedf27660d5ff07cda7b181
This commit is contained in:
Kubernetes Publisher 2020-12-08 17:28:27 -08:00
parent 2cbad6fc87 c2f3123308
commit 01bd50ac78
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -692,11 +692,11 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "4a626d306b98" "Rev": "d10e393578ca"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "2456ebdaba22" "Rev": "8f01ffc4dcb8"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",

8
go.mod
View File

@ -41,8 +41,8 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201114085527-4a626d306b98 k8s.io/api v0.0.0-20201209045732-d10e393578ca
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22 k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8
k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9 k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
@ -54,8 +54,8 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98 k8s.io/api => k8s.io/api v0.0.0-20201209045732-d10e393578ca
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8
k8s.io/client-go => k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9 k8s.io/client-go => k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9
k8s.io/component-base => k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba k8s.io/component-base => k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
) )

4
go.sum
View File

@ -601,8 +601,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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ= k8s.io/api v0.0.0-20201209045732-d10e393578ca/go.mod h1:xjrWEKNUnu5XTPx3c+1VDDkb3vXmUiTwwHureX1M32c=
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.0.0-20201209005534-8f01ffc4dcb8/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9/go.mod h1:UTdyXFcu9VZV4qQRKGXCa0KdMX4HTCXClRs4s7yFdDQ= k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9/go.mod h1:UTdyXFcu9VZV4qQRKGXCa0KdMX4HTCXClRs4s7yFdDQ=
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba/go.mod h1:g6NgUWq2J9mdXytMdP+mNUKEH3kQqHysQcJz3HJEh/U= k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba/go.mod h1:g6NgUWq2J9mdXytMdP+mNUKEH3kQqHysQcJz3HJEh/U=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

2
pkg/endpoints/handlers/fieldmanager/node.yaml
View File

@ -15,6 +15,8 @@ metadata:
cloud.google.com/gke-os-distribution: cos cloud.google.com/gke-os-distribution: cos
failure-domain.beta.kubernetes.io/region: us-central1 failure-domain.beta.kubernetes.io/region: us-central1
failure-domain.beta.kubernetes.io/zone: us-central1-b failure-domain.beta.kubernetes.io/zone: us-central1-b
topology.kubernetes.io/region: us-central1
topology.kubernetes.io/zone: us-central1-b
kubernetes.io/hostname: node-default-pool-something kubernetes.io/hostname: node-default-pool-something
name: node-default-pool-something name: node-default-pool-something
resourceVersion: "211582541" resourceVersion: "211582541"