Merge pull request #5749 from abutcher/servinginfo-client-ca-upgrade

Automatic merge from submit-queue.

Set servingInfo.clientCA to ca.crt during upgrade.

https://bugzilla.redhat.com/show_bug.cgi?id=1501795

playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml

@@ -8,3 +8,8 @@
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
     yaml_key: 'controllerConfig.serviceServingCert.signer.keyFile'
     yaml_value: service-signer.key
+
+- modify_yaml:
+    dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+    yaml_key: servingInfo.clientCA
+    yaml_value: ca.crt

playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml

@@ -13,3 +13,8 @@
     dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
     yaml_key: 'controllerConfig.serviceServingCert.signer.keyFile'
     yaml_value: service-signer.key
+
+- modify_yaml:
+    dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+    yaml_key: servingInfo.clientCA
+    yaml_value: ca.crt