mirror of https://github.com/kubernetes/kops.git
gce: Always apply the metadata-proxy-ready node label
This restores the behaviour before #14127, which wasn't documented / intended.
This commit is contained in:
parent
b899bf6440
commit
8f7ef492bf
|
@ -92,6 +92,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
|
|
@ -139,6 +139,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
@ -159,6 +161,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
@ -179,6 +183,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
|
|
@ -91,6 +91,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
|
|
@ -91,6 +91,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
|
|
@ -128,6 +128,8 @@ spec:
|
||||||
machineType: e2-medium
|
machineType: e2-medium
|
||||||
maxSize: 1
|
maxSize: 1
|
||||||
minSize: 1
|
minSize: 1
|
||||||
|
nodeLabels:
|
||||||
|
cloud.google.com/metadata-proxy-ready: "true"
|
||||||
role: Node
|
role: Node
|
||||||
subnets:
|
subnets:
|
||||||
- us-test1
|
- us-test1
|
||||||
|
|
|
@ -1013,6 +1013,13 @@ func setupNodes(opt *NewClusterOptions, cluster *api.Cluster, zoneToSubnetMap ma
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if cloudProvider == api.CloudProviderGCE {
|
||||||
|
if g.Spec.NodeLabels == nil {
|
||||||
|
g.Spec.NodeLabels = make(map[string]string)
|
||||||
|
}
|
||||||
|
g.Spec.NodeLabels["cloud.google.com/metadata-proxy-ready"] = "true"
|
||||||
|
}
|
||||||
|
|
||||||
g.Spec.MachineType = opt.NodeSize
|
g.Spec.MachineType = opt.NodeSize
|
||||||
g.Spec.Image = opt.NodeImage
|
g.Spec.Image = opt.NodeImage
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue