From 8f2a3249848e7520de83ab1b9df54b72455a99ec Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <brtknr@bath.edu>
Date: Thu, 21 Nov 2019 12:10:39 +0000
Subject: [PATCH] Use --containerized flag to support 1.{13,14,15}.x in Atomic

The flag has been removed in Kubernetes version 1.16.x for which users
should use Podman but to continue to use Fedora Atomic without
use_podman=true which means using Docker 1.13.x, ServiceAccount tokens
cannot be propagated without using the --containerized flag when
use_podman=false.

This flag should not have been removed in
I3efd4e55e885b95721f13279b44dc1246e2fd2e4.

Story: 2006846
Task: 37434

Change-Id: I5ccef63de928ff01d10dc4cc500d0e1583eb0378
---
 dockerfiles/kubernetes-kubelet/launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfiles/kubernetes-kubelet/launch.sh b/dockerfiles/kubernetes-kubelet/launch.sh
index a331ea4c12..eee35660e8 100755
--- a/dockerfiles/kubernetes-kubelet/launch.sh
+++ b/dockerfiles/kubernetes-kubelet/launch.sh
@@ -11,4 +11,4 @@ ARGS=$(echo $ARGS | sed s/--cadvisor-port=0//)
 ARGS=$(echo $ARGS | sed s/--require-kubeconfig//)
 ARGS=$(echo $ARGS | sed s/node-role/node/)
 
-exec /hyperkube kubelet $ARGS
+exec /hyperkube kubelet $ARGS --containerized