openstack/magnum
Code Issues Proposed changes

Merge "Support TimeoutStartSec for k8s systemd services"

Browse Source
This commit is contained in:
Zuul 2019-11-13 11:20:16 +00:00 committed by Gerrit Code Review
commit b07f8ba861
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
View File

@ -102,6 +102,7 @@ ExecStop=-/usr/bin/podman stop kube-apiserver
Delegate=yes
Restart=always
RestartSec=10
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target
EOF
@ -130,6 +131,7 @@ ExecStop=-/usr/bin/podman stop kube-controller-manager
Delegate=yes
Restart=always
RestartSec=10
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target
EOF
@ -157,6 +159,7 @@ ExecStop=-/usr/bin/podman stop kube-scheduler
Delegate=yes
Restart=always
RestartSec=10
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target
EOF
@ -204,6 +207,7 @@ ExecStop=-/usr/bin/podman stop kubelet
Delegate=yes
Restart=always
RestartSec=10
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target
EOF
@ -235,6 +239,7 @@ ExecStop=-/usr/bin/podman stop kube-proxy
Delegate=yes
Restart=always
RestartSec=10
TimeoutStartSec=10min
[Install]
WantedBy=multi-user.target
EOF

2
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
View File

@ -103,6 +103,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
ExecStop=-/usr/bin/podman stop kubelet
Delegate=yes
Restart=always
TimeoutStartSec=10min
RestartSec=10
[Install]
WantedBy=multi-user.target
@ -134,6 +135,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
ExecStop=-/usr/bin/podman stop kube-proxy
Delegate=yes
Restart=always
TimeoutStartSec=10min
RestartSec=10
[Install]
WantedBy=multi-user.target