Commit b2917ba2 authored by Brian Standley's avatar Brian Standley
Browse files

increase notify timeout, specify rolling reboot on resize

parent 1a6faccb
......@@ -40,7 +40,7 @@ Be sure to provide the same version of the template as well as the original valu
*This is a partial list!*
- After scaling down, the removed nodes must be deleted from Kubernetes by hand.
- When changing the flavor, all worker nodes **reboot simultaneously**.
- When changing the flavor, the will be a rolling reboot of the worker nodes, one per 60 seconds.
- The external network and application credential parameters cannot be changed after the initial deployment.
- The key pair and extra keys can be updated, but this only affects new worker nodes.
- Load balancers are not automatically cleaned-up prior to stack deletion, which blocks stack deletion.
......
......@@ -114,13 +114,10 @@ resources:
network: { get_resource: k8s-net }
security_groups:
- { get_resource: k8s-secgroup }
# fixed_ips:
# - subnet: { get_resource: k8s-subnet }
# ip_address: 192.168.0.10 (not really necessary since you login via the fip)
k8s-controller-fip:
type: OS::Neutron::FloatingIP
depends_on: k8s-router-interface # prevent a race condition -- port could get created before the router actually supports fips on this network
depends_on: k8s-router-interface # prevent a race condition -- port could get created before the router actually supports fips on this network
properties:
floating_network: { get_param: external_network }
port_id: { get_resource: k8s-controller-port }
......@@ -139,6 +136,9 @@ resources:
k8s-worker:
type: OS::Heat::ResourceGroup
update_policy:
rolling_update:
pause_time: 60
properties:
count: { get_param: scale }
resource_def:
......@@ -192,17 +192,6 @@ resources:
apt-get install -y kubelet='1.21.*' kubeadm='1.21.*' kubectl='1.21.*'
apt-mark hold kubelet kubeadm kubectl
#cat > /etc/modules-load.d/k8s.conf <<EOF
#br_netfilter
#EOF
#modprobe br_netfilter
#cat > /etc/sysctl.d/k8s.conf <<EOF
#net.bridge.bridge-nf-call-ip6tables = 1
#net.bridge.bridge-nf-call-iptables = 1
#EOF
#sysctl --system
k8s-controller-config:
type: OS::Heat::MultipartMime
properties:
......@@ -269,7 +258,7 @@ resources:
- config:
str_replace:
params:
$JOIN_COMMAND: { get_attr: [ k8s-join-wait, data ] } # parse json here?
$JOIN_COMMAND: { get_attr: [ k8s-join-wait, data ] } # parse json here?
template: |
#!/bin/bash
apt-get install -y jq
......@@ -282,7 +271,7 @@ resources:
type: OS::Heat::WaitCondition
properties:
handle: { get_resource: k8s-join-handle }
timeout: 300
timeout: 600
outputs:
controlplane_ip:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment