shixiong/okd @ a310ad860090d050b9c71a54ea0b1cc38f104db4

OpenShift Merge Robot c4ad5ca66a Merge pull request #8447 from mgugino-upstream-stage/define-cli-image-once		6 éve
..
defaults	29692bcb64 Consolidate image diciontaries and strings	6 éve
files	5d5d25bf17 Upgrade to 3.10 with static pods	7 éve
meta	29692bcb64 Consolidate image diciontaries and strings	6 éve
tasks	5b5c1813eb add volume config generation	6 éve
templates	5b5c1813eb add volume config generation	6 éve