From 1876211d8c31677d5aad38418b18f8b560c25728 Mon Sep 17 00:00:00 2001 From: PanFengyun Date: Tue, 11 Oct 2016 09:37:59 +0800 Subject: [PATCH] Fix the config args of kubernetes service Many parameters of magnum templates use '_' instead of '-', but all the args of kubernetes service use '-'. So let's format the parameters. Change-Id: I80b356f2b853008e18edce3123add89b8ef7ea26 --- .../fragments/configure-kubernetes-master.sh | 16 ++++++++-------- .../fragments/configure-kubernetes-minion.sh | 6 +++--- .../fragments/enable-kube-apiserver.yaml | 4 ++-- .../fragments/enable-kubelet-master.yaml | 2 +- .../fragments/enable-kubelet-minion.yaml | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index 0d6308b585..c732beda87 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -14,33 +14,33 @@ sed -i ' ' /etc/etcd/etcd.conf sed -i ' - /^KUBE_ALLOW_PRIV=/ s/=.*/="--allow_privileged='"$KUBE_ALLOW_PRIV"'"/ + /^KUBE_ALLOW_PRIV=/ s/=.*/="--allow-privileged='"$KUBE_ALLOW_PRIV"'"/ ' /etc/kubernetes/config -KUBE_API_ARGS="--runtime_config=api/all=true" +KUBE_API_ARGS="--runtime-config=api/all=true" if [ "$TLS_DISABLED" == "True" ]; then KUBE_API_ADDRESS="--insecure-bind-address=0.0.0.0 --insecure-port=$KUBE_API_PORT" else - KUBE_API_ADDRESS="--bind_address=0.0.0.0 --secure-port=$KUBE_API_PORT" + KUBE_API_ADDRESS="--bind-address=0.0.0.0 --secure-port=$KUBE_API_PORT" # insecure port is used internaly KUBE_API_ADDRESS="$KUBE_API_ADDRESS --insecure-port=8080" - KUBE_API_ARGS="$KUBE_API_ARGS --tls_cert_file=/srv/kubernetes/server.crt" - KUBE_API_ARGS="$KUBE_API_ARGS --tls_private_key_file=/srv/kubernetes/server.key" - KUBE_API_ARGS="$KUBE_API_ARGS --client_ca_file=/srv/kubernetes/ca.crt" + KUBE_API_ARGS="$KUBE_API_ARGS --tls-cert-file=/srv/kubernetes/server.crt" + KUBE_API_ARGS="$KUBE_API_ARGS --tls-private-key-file=/srv/kubernetes/server.key" + KUBE_API_ARGS="$KUBE_API_ARGS --client-ca-file=/srv/kubernetes/ca.crt" fi sed -i ' /^KUBE_API_ADDRESS=/ s/=.*/='"${KUBE_API_ADDRESS}"'/ /^KUBE_SERVICE_ADDRESSES=/ s|=.*|="--service-cluster-ip-range='"$PORTAL_NETWORK_CIDR"'"| /^KUBE_API_ARGS=/ s/KUBE_API_ARGS.// - /^KUBE_ETCD_SERVERS=/ s/=.*/="--etcd_servers=http:\/\/127.0.0.1:2379"/ + /^KUBE_ETCD_SERVERS=/ s/=.*/="--etcd-servers=http:\/\/127.0.0.1:2379"/ /^KUBE_ADMISSION_CONTROL=/ s/=.*/=""/ ' /etc/kubernetes/apiserver cat << _EOC_ >> /etc/kubernetes/apiserver #Uncomment the following line to disable Load Balancer feature KUBE_API_ARGS="$KUBE_API_ARGS" #Uncomment the following line to enable Load Balancer feature -#KUBE_API_ARGS="$KUBE_API_ARGS --cloud_config=/etc/sysconfig/kube_openstack_config --cloud_provider=openstack" +#KUBE_API_ARGS="$KUBE_API_ARGS --cloud-config=/etc/sysconfig/kube_openstack_config --cloud-provider=openstack" _EOC_ sed -i ' diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index 997b182d76..5af0103e6e 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -20,8 +20,8 @@ fi KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT" sed -i ' - /^KUBE_ALLOW_PRIV=/ s/=.*/="--allow_privileged='"$KUBE_ALLOW_PRIV"'"/ - /^KUBE_ETCD_SERVERS=/ s|=.*|="--etcd_servers=http://'"$ETCD_SERVER_IP"':2379"| + /^KUBE_ALLOW_PRIV=/ s/=.*/="--allow-privileged='"$KUBE_ALLOW_PRIV"'"/ + /^KUBE_ETCD_SERVERS=/ s|=.*|="--etcd-servers=http://'"$ETCD_SERVER_IP"':2379"| /^KUBE_MASTER=/ s|=.*|="--master='"$KUBE_MASTER_URI"'"| ' /etc/kubernetes/config @@ -42,7 +42,7 @@ fi sed -i ' /^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/ /^KUBELET_HOSTNAME=/ s/=.*/=""/ - /^KUBELET_API_SERVER=/ s|=.*|="--api_servers='"$KUBE_MASTER_URI"'"| + /^KUBELET_API_SERVER=/ s|=.*|="--api-servers='"$KUBE_MASTER_URI"'"| /^KUBELET_ARGS=/ s|=.*|="'"${KUBELET_ARGS}"'"| ' /etc/kubernetes/kubelet diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml index d4de5b541f..10a14e8c1f 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kube-apiserver.yaml @@ -59,10 +59,10 @@ write_files: - /hyperkube - apiserver - ${BIND_ADDRESS_CMD} - - --etcd_servers=http://127.0.0.1:2379 + - --etcd-servers=http://127.0.0.1:2379 - --allow-privileged=true - --service-cluster-ip-range=${PORTAL_NETWORK_CIDR} - - --secure_port=${SECURE_PORT} + - --secure-port=${SECURE_PORT} - --insecure-port=${INSECURE_PORT} - --tls-cert-file=${TLS_CERT_FILE} - --tls-private-key-file=${TLS_PRIVATE_KEY_FILE} diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml index cac846c69c..c60bfb7c76 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml @@ -29,7 +29,7 @@ write_files: [Service] Environment=KUBELET_VERSION=${KUBE_VERSION}_coreos.0 ExecStart=/usr/lib/coreos/kubelet-wrapper \ - --api_servers=http://127.0.0.1:8080 \ + --api-servers=http://127.0.0.1:8080 \ --address=0.0.0.0 \ --register-node=true \ --register-schedulable=false \ diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml index 37bb86aaaf..4952f47a73 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml @@ -42,7 +42,7 @@ write_files: [Service] Environment=KUBELET_VERSION=${KUBE_VERSION}_coreos.0 ExecStart=/usr/lib/coreos/kubelet-wrapper \ - --api_servers=${KUBE_MASTER_URI} \ + --api-servers=${KUBE_MASTER_URI} \ --address=0.0.0.0 \ --register-node=true \ --allow-privileged=true \