summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-20 19:06:45 -0700
committerGitHub <noreply@github.com>2017-09-20 19:06:45 -0700
commitd58fe2d712e7445f55d63431968ccf00ac3df2f4 (patch)
tree0d01cbce3248eaa1fbb0ca2dc3d7ee99e98d0c04 /playbooks/common
parent5637b611cea56f6262084177ba939cdf7bb5287b (diff)
parent680129e59b7cd05534e2690aec59e810924c6552 (diff)
downloadopenshift-d58fe2d712e7445f55d63431968ccf00ac3df2f4.tar.gz
openshift-d58fe2d712e7445f55d63431968ccf00ac3df2f4.tar.bz2
openshift-d58fe2d712e7445f55d63431968ccf00ac3df2f4.tar.xz
openshift-d58fe2d712e7445f55d63431968ccf00ac3df2f4.zip
Merge pull request #5474 from simo5/noreconcile
Automatic merge from submit-queue Do not reconcile in >= 3.7 Starting with 3.7 we use kube's RBAC which happens to do a forceful reconcile at server startup. Explicit reconciles are not needed anymore.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index b75aae589..4e73293f0 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -189,8 +189,6 @@
roles:
- { role: openshift_cli }
vars:
- origin_reconcile_bindings: "{{ deployment_type == 'origin' and openshift_version | version_compare('1.0.6', '>') }}"
- ent_reconcile_bindings: true
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
# Another spot where we assume docker is running and do not want to accidentally trigger an unsafe
# restart.
@@ -201,6 +199,7 @@
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
policy reconcile-cluster-roles --additive-only=true --confirm -o name
register: reconcile_cluster_role_result
+ when: not openshift.common.version_gte_3_7 | bool
changed_when:
- reconcile_cluster_role_result.stdout != ''
- reconcile_cluster_role_result.rc == 0
@@ -215,7 +214,7 @@
--exclude-groups=system:unauthenticated
--exclude-users=system:anonymous
--additive-only=true --confirm -o name
- when: origin_reconcile_bindings | bool or ent_reconcile_bindings | bool
+ when: not openshift.common.version_gte_3_7 | bool
register: reconcile_bindings_result
changed_when:
- reconcile_bindings_result.stdout != ''
@@ -230,7 +229,7 @@
changed_when:
- reconcile_jenkins_role_binding_result.stdout != ''
- reconcile_jenkins_role_binding_result.rc == 0
- when: openshift.common.version_gte_3_4_or_1_4 | bool
+ when: (not openshift.common.version_gte_3_7 | bool) and (openshift.common.version_gte_3_4_or_1_4 | bool)
- name: Reconcile Security Context Constraints
command: >