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

Fix weave daemonset labels to be backwards compatible 

Otherwise the kops 1.5 -> kops 1.6 upgrade was failing with:

The DaemonSet "weave-net" is invalid: spec.template.metadata.labels:
Invalid value: {"name":"weave-net"}: `selector` does not match template
`labels`

Fix #2345
This commit is contained in:
Justin Santa Barbara 2017-04-13 03:20:17 -04:00
parent f7edd0b3f9
commit cf51bd943b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/models/cloudup/resources/addons/networking.weave/k8s-1.6.yaml
View File

@ -53,12 +53,14 @@ metadata:
name: weave-net name: weave-net
namespace: kube-system namespace: kube-system
labels: labels:
name: weave-net
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
spec: spec:
template: template:
metadata: metadata:
labels: labels:
name: weave-net name: weave-net
role.kubernetes.io/networking: "1"
spec: spec:
hostNetwork: true hostNetwork: true
hostPID: true hostPID: true

2
upup/models/cloudup/resources/addons/networking.weave/pre-k8s-1.6.yaml
View File

@ -4,12 +4,14 @@ metadata:
name: weave-net name: weave-net
namespace: kube-system namespace: kube-system
labels: labels:
name: weave-net
role.kubernetes.io/networking: "1" role.kubernetes.io/networking: "1"
spec: spec:
template: template:
metadata: metadata:
labels: labels:
name: weave-net name: weave-net
role.kubernetes.io/networking: "1"
annotations: annotations:
scheduler.alpha.kubernetes.io/tolerations: | scheduler.alpha.kubernetes.io/tolerations: |
[ [