diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2018-01-11 15:00:11 -0500 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2018-01-11 15:00:11 -0500 |
| commit | b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4 (patch) | |
| tree | 0df704465115a36eefc55fafc4e7b38e7faee8d6 /roles/openshift_service_catalog | |
| parent | 9ce10b8415cd53042e80520a918b4541a9e785d1 (diff) | |
| download | openshift-b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4.tar.gz openshift-b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4.tar.bz2 openshift-b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4.tar.xz openshift-b46b2d9f9c2e020ecbd89ea0ba11e8960bef0fc4.zip | |
Add var for controller to enable async bindings
New variable is called
'openshift_service_catalog_async_bindings_enabled' and is set to false
by default.
Also, fixed a typo in the controller template for the DaemonSet update
strategy, which caused the strategy to be set to OnDelete rather than
the intended RollingUpdate.
Diffstat (limited to 'roles/openshift_service_catalog')
| -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 |