Skip to content

Commit 97c1b72

Browse files
committed
Merge remote-tracking branch 'origin/4.14' into 4.15
2 parents f8ad3ad + 709ebf6 commit 97c1b72

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • plugins/integrations/kubernetes-service/src/main/resources/conf

plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ write-files:
204204
fi
205205
retval=0
206206
set +e
207-
kubeadm init --token {{ k8s_master.cluster.token }} {{ k8s_master.cluster.initargs }}
207+
kubeadm init --token {{ k8s_master.cluster.token }} --token-ttl 0 {{ k8s_master.cluster.initargs }}
208208
retval=$?
209209
set -e
210210
if [ $retval -eq 0 ]; then

0 commit comments

Comments
 (0)