Cherry pick fix_bootstrap_and_configmap into release 0.18

Original MR: !340 (merged)

This MR for resolving issue

Edited by David Diederich

Merge request reports

Loading