소스 검색

Disable proxy cert config upgrade until certs being generated.

Devan Goodwin 9 년 전
부모
커밋
abab19316f
1개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      playbooks/adhoc/upgrades/library/openshift_upgrade_config.py

+ 6 - 5
playbooks/adhoc/upgrades/library/openshift_upgrade_config.py

@@ -49,11 +49,12 @@ def upgrade_master_3_0_to_3_1(backup):
             changed = True
 
     # Add the new master proxy client certs:
-    if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
-        config['kubernetesMasterConfig']['proxyClientInfo'] = {
-            'certFile': 'master.proxy-client.crt',
-            'keyFile': 'master.proxy-client.key'
-        }
+    # TODO: re-enable this once these certs are generated during upgrade:
+#    if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
+#        config['kubernetesMasterConfig']['proxyClientInfo'] = {
+#            'certFile': 'master.proxy-client.crt',
+#            'keyFile': 'master.proxy-client.key'
+#       }
 
     if changed:
         if backup: