encryption: fix freezing key controller#615

openshift-merge-robot merged 4 commits intoopenshift:masteropenshift/library-go:masterfrom

sttts:sttts-encryption-frozen-key-controllersttts/library-go:sttts-encryption-frozen-key-controllerCopy head branch name to clipboard