summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-23 16:05:37 -0400
committerGitHub <noreply@github.com>2016-08-23 16:05:37 -0400
commitba4a74b40905e9019af47b89b29f66162ccfd14e (patch)
tree457f0ccba752ac7af28da177defc80cf82931861
parentdba67f91f734e93b7932e25f4f0461c7a6da8d27 (diff)
parent94fd41c721cf0c1ba3ae090ea9887e7f19c80590 (diff)
downloadopenshift-ba4a74b40905e9019af47b89b29f66162ccfd14e.tar.gz
openshift-ba4a74b40905e9019af47b89b29f66162ccfd14e.tar.bz2
openshift-ba4a74b40905e9019af47b89b29f66162ccfd14e.tar.xz
openshift-ba4a74b40905e9019af47b89b29f66162ccfd14e.zip
Merge pull request #2339 from dgoodwin/plugin-order-warning
Add warning at end of 3.3 upgrade if pluginOrderOverride is found.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post.yml b/playbooks/common/openshift-cluster/upgrades/post.yml
index bd97d0b34..796634a5e 100644
--- a/playbooks/common/openshift-cluster/upgrades/post.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post.yml
@@ -56,3 +56,16 @@
{{ oc_cmd }} patch dc/docker-registry -n default -p
'{"spec":{"template":{"spec":{"containers":[{"name":"registry","image":"{{ registry_image }}"}]}}}}'
--api-version=v1
+
+# Check for warnings to be printed at the end of the upgrade:
+- name: Check for warnings
+ hosts: oo_masters_to_config
+ tasks:
+ # Check if any masters are using pluginOrderOverride and warn if so, only for 1.3/3.3 and beyond:
+ - command: >
+ grep pluginOrderOverride {{ openshift.common.config_base }}/master/master-config.yaml
+ register: grep_plugin_order_override
+ when: openshift.common.version_gte_3_3_or_1_3 | bool
+ - name: Warn if pluginOrderOverride is in use in master-config.yaml
+ debug: msg="WARNING pluginOrderOverride is being deprecated in master-config.yaml, please see https://docs.openshift.com/enterprise/latest/architecture/additional_concepts/admission_controllers.html for more information."
+ when: not grep_plugin_order_override | skipped and grep_plugin_order_override.rc == 0