Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kube-router: remove beta annotation versions (deprectated in 1.8) of init container #3620

Merged
merged 1 commit into from
Nov 10, 2017
Merged

kube-router: remove beta annotation versions (deprectated in 1.8) of init container #3620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,6 @@ spec:
tier: node
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
pod.beta.kubernetes.io/init-containers: '[
{
"name": "install-cni",
"image": "busybox",
"command": [ "/bin/sh", "-c", "set -e -x; if [ ! -f /etc/cni/net.d/10-kuberouter.conf ]; then TMP=/etc/cni/net.d/.tmp-kuberouter-cfg; cp /etc/kube-router/cni-conf.json ${TMP}; mv ${TMP} /etc/cni/net.d/10-kuberouter.conf; fi" ],
"volumeMounts": [
{
"name": "cni",
"mountPath": "/etc/cni/net.d"
},
{
"name": "kube-router-cfg",
"mountPath": "/etc/kube-router"
}
],
"volumes": {
"name": "cni",
"hostPath": {
"path": "/etc/cni/net.d"
}
}
}
]'
spec:
containers:
- name: kube-router
Expand All @@ -82,11 +59,29 @@ spec:
- name: lib-modules
mountPath: /lib/modules
readOnly: true
- name: cni
- name: cni-conf-dir
mountPath: /etc/cni/net.d
- name: kubeconfig
mountPath: /var/lib/kube-router/kubeconfig
readOnly: true
initContainers:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When did the API change? I think 1.7? If so we need a 1.7 version we manifest.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read more ;) we need a 1.8 version of the manifest

- name: install-cni
image: busybox
imagePullPolicy: Always
command:
- /bin/sh
- -c
- set -e -x;
if [ ! -f /etc/cni/net.d/10-kuberouter.conf ]; then
TMP=/etc/cni/net.d/.tmp-kuberouter-cfg;
cp /etc/kube-router/cni-conf.json ${TMP};
mv ${TMP} /etc/cni/net.d/10-kuberouter.conf;
fi
volumeMounts:
- name: cni-conf-dir
mountPath: /etc/cni/net.d
- name: kube-router-cfg
mountPath: /etc/kube-router
hostNetwork: true
serviceAccountName: kube-router
tolerations:
Expand All @@ -101,7 +96,7 @@ spec:
name: lib-modules
- hostPath:
path: /etc/cni/net.d
name: cni
name: cni-conf-dir
- name: kubeconfig
hostPath:
path: /var/lib/kube-router/kubeconfig
Expand Down