openstack
/
magnum
Code Issues Proposed changes

Make kubernetes image version united into a variable 

Now kubernetes image is 1.0.6 and written in so many file.
It is difficult to modify the parameter when we need to change
it.

The patch make the value united a variable.

Change-Id: Ic476ffc90e4379e5a978c96dcc0f745e8d7fddd8
This commit is contained in:
wangqun 2016-03-21 10:14:39 +00:00
parent ddb7eeaab3
commit 392a84ad40
16 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/templates/kubernetes/fragments/enable-kube-apiserver-coreos.yaml
View File

@ -46,7 +46,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-apiserver
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- apiserver

2
magnum/templates/kubernetes/fragments/enable-kube-controller-manager-coreos.yaml
View File

@ -39,7 +39,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-controller-manager
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- controller-manager

4
magnum/templates/kubernetes/fragments/enable-kube-podmaster.sh
View File

@ -76,7 +76,7 @@ metadata:
spec:
containers:
- name: kube-controller-manager
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- controller-manager
@ -122,7 +122,7 @@ spec:
hostNetwork: true
containers:
- name: kube-scheduler
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- scheduler

2
magnum/templates/kubernetes/fragments/enable-kube-proxy-master-coreos.yaml
View File

@ -39,7 +39,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- proxy

2
magnum/templates/kubernetes/fragments/enable-kube-proxy-master.sh
View File

@ -17,7 +17,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- proxy

2
magnum/templates/kubernetes/fragments/enable-kube-proxy-minion-coreos.yaml
View File

@ -42,7 +42,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- proxy

2
magnum/templates/kubernetes/fragments/enable-kube-proxy-minion.sh
View File

@ -25,7 +25,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- proxy

2
magnum/templates/kubernetes/fragments/enable-kube-scheduler-coreos.yaml
View File

@ -35,7 +35,7 @@ write_files:
hostNetwork: true
containers:
- name: kube-scheduler
image: gcr.io/google_containers/hyperkube:v1.0.6
image: gcr.io/google_containers/hyperkube:${KUBE_VERSION}
command:
- /hyperkube
- scheduler

1
magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
View File

@ -30,3 +30,4 @@ write_files:
HTTPS_PROXY="$HTTPS_PROXY"
NO_PROXY="$NO_PROXY"
WAIT_CURL="$WAIT_CURL"
KUBE_VERSION="$KUBE_VERSION"

1
magnum/templates/kubernetes/fragments/write-heat-params.yaml
View File

@ -31,3 +31,4 @@ write_files:
HTTPS_PROXY="$HTTPS_PROXY"
NO_PROXY="$NO_PROXY"
WAIT_CURL="$WAIT_CURL"
KUBE_VERSION="$KUBE_VERSION"

7
magnum/templates/kubernetes/kubecluster-coreos.yaml
View File

@ -146,6 +146,11 @@ parameters:
type: string
description: url for keystone
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.0.6
resources:
######################################################################
@ -211,6 +216,7 @@ resources:
network_driver: {get_param: network_driver}
kubernetes_port: {get_param: kubernetes_port}
tls_disabled: {get_param: tls_disabled}
kube_version: {get_param: kube_version}
######################################################################
#
@ -240,6 +246,7 @@ resources:
network_driver: {get_param: network_driver}
kubernetes_port: {get_param: kubernetes_port}
tls_disabled: {get_param: tls_disabled}
kube_version: {get_param: kube_version}
etcd_server_ip: {"Fn::Select": [0, {get_attr: [kube_master, kube_master_ip]}]}
outputs:

7
magnum/templates/kubernetes/kubecluster.yaml
View File

@ -274,6 +274,11 @@ parameters:
type: string
description: url for keystone
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.0.6
resources:
######################################################################
@ -452,6 +457,7 @@ resources:
http_proxy: {get_param: http_proxy}
https_proxy: {get_param: https_proxy}
no_proxy: {get_param: no_proxy}
kube_version: {get_param: kube_version}
######################################################################
#
@ -502,6 +508,7 @@ resources:
http_proxy: {get_param: http_proxy}
https_proxy: {get_param: https_proxy}
no_proxy: {get_param: no_proxy}
kube_version: {get_param: kube_version}
outputs:

5
magnum/templates/kubernetes/kubemaster-coreos.yaml
View File

@ -98,6 +98,10 @@ parameters:
service.
default: 8080
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
resources:
master_wait_handle:
@ -170,6 +174,7 @@ resources:
"$NETWORK_DRIVER": {get_param: network_driver}
"$KUBE_API_PORT": {get_param: kubernetes_port}
"$TLS_DISABLED": {get_param: tls_disabled}
"$KUBE_VERSION": {get_param: kube_version}
configure_etcd:
type: OS::Heat::SoftwareConfig

4
magnum/templates/kubernetes/kubemaster.yaml
View File

@ -154,6 +154,9 @@ parameters:
type: string
description: no proxies for docker
default: ""
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
resources:
@ -205,6 +208,7 @@ resources:
"$HTTP_PROXY": {get_param: http_proxy}
"$HTTPS_PROXY": {get_param: https_proxy}
"$NO_PROXY": {get_param: no_proxy}
"$KUBE_VERSION": {get_param: kube_version}
"$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
make_cert:

5
magnum/templates/kubernetes/kubeminion-coreos.yaml
View File

@ -50,6 +50,10 @@ parameters:
service.
default: 8080
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
# The following are all generated in the parent template.
kube_master_ip:
type: string
@ -111,6 +115,7 @@ resources:
$TLS_DISABLED: {get_param: tls_disabled}
$NETWORK_DRIVER: {get_param: network_driver}
$ETCD_SERVER_IP: {get_param: etcd_server_ip}
$KUBE_VERSION: {get_param: kube_version}
enable_network_service:
type: OS::Heat::SoftwareConfig

5
magnum/templates/kubernetes/kubeminion.yaml
View File

@ -166,6 +166,10 @@ parameters:
description: no proxies for docker
default: ""
kube_version:
type: string
description: version of kubenetes used for kubernetes cluster
resources:
minion_wait_handle:
@ -217,6 +221,7 @@ resources:
$HTTP_PROXY: {get_param: http_proxy}
$HTTPS_PROXY: {get_param: https_proxy}
$NO_PROXY: {get_param: no_proxy}
$KUBE_VERSION: {get_param: kube_version}
$WAIT_CURL: {get_attr: [minion_wait_handle, curl_cli]}
write_kubeconfig: