diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-13 11:41:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 11:41:46 -0500 |
| commit | 6753e23ce8e08d9143bee31e004ce4d8742a848c (patch) | |
| tree | 8153492edfbda3ff5f253e9dec288f29f7fc16ac | |
| parent | de168fd74e288e529b925e29406f845590f8323d (diff) | |
| parent | b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4 (diff) | |
| download | openshift-6753e23ce8e08d9143bee31e004ce4d8742a848c.tar.gz openshift-6753e23ce8e08d9143bee31e004ce4d8742a848c.tar.bz2 openshift-6753e23ce8e08d9143bee31e004ce4d8742a848c.tar.xz openshift-6753e23ce8e08d9143bee31e004ce4d8742a848c.zip | |
Merge pull request #6705 from jpeeler/add-async-bindings-var
Add var for catalog controller to enable async bindings
| -rw-r--r-- | roles/openshift_service_catalog/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/templates/controller_manager.j2 | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_service_catalog/defaults/main.yml b/roles/openshift_service_catalog/defaults/main.yml index 7c848cb12..15ca9838c 100644 --- a/roles/openshift_service_catalog/defaults/main.yml +++ b/roles/openshift_service_catalog/defaults/main.yml @@ -1,6 +1,7 @@ --- openshift_service_catalog_remove: false openshift_service_catalog_nodeselector: {"openshift-infra": "apiserver"} +openshift_service_catalog_async_bindings_enabled: false openshift_use_openshift_sdn: True # os_sdn_network_plugin_name: "{% if openshift_use_openshift_sdn %}redhat/openshift-ovs-subnet{% else %}{% endif %}" diff --git a/roles/openshift_service_catalog/templates/controller_manager.j2 b/roles/openshift_service_catalog/templates/controller_manager.j2 index 137222f04..c61e05f73 100644 --- a/roles/openshift_service_catalog/templates/controller_manager.j2 +++ b/roles/openshift_service_catalog/templates/controller_manager.j2 @@ -8,7 +8,7 @@ spec: selector: matchLabels: app: controller-manager - strategy: + updateStrategy: rollingUpdate: maxUnavailable: 1 type: RollingUpdate @@ -38,6 +38,10 @@ spec: - "5m" - --feature-gates - OriginatingIdentity=true +{% if openshift_service_catalog_async_bindings_enabled | bool %} + - --feature-gates + - AsyncBindingOperations=true +{% endif %} image: {{ openshift_service_catalog_image_prefix }}service-catalog:{{ openshift_service_catalog_image_version }} command: ["/usr/bin/service-catalog"] imagePullPolicy: Always |