diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-11-10 12:42:48 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-11-22 12:05:13 -0500 |
| commit | efecf62dc56a621e21962f66553d5ad3872286e5 (patch) | |
| tree | 5b200a1f110b68680323faea708c76c1b7a2ea8b /roles/openshift_master | |
| parent | e2d6fe37d6a599715d3136cd396ca8f27b5fb9b7 (diff) | |
| download | openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.gz openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.bz2 openshift-efecf62dc56a621e21962f66553d5ad3872286e5.tar.xz openshift-efecf62dc56a621e21962f66553d5ad3872286e5.zip | |
Merge kube_admission_plugin_config with admission_plugin_config
Move the values in kube_admission_plugin_config up one level per
the new format from 1.3:
"The kubernetesMasterConfig.admissionConfig.pluginConfig should be moved
and merged into admissionConfig.pluginConfig."
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index a52ae578c..dc9226a5a 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -1,7 +1,4 @@ admissionConfig: -{% if 'admission_plugin_order' in openshift.master %} - pluginOrderOverride:{{ openshift.master.admission_plugin_order | to_padded_yaml(level=2) }} -{% endif %} {% if 'admission_plugin_config' in openshift.master %} pluginConfig:{{ openshift.master.admission_plugin_config | to_padded_yaml(level=2) }} {% endif %} @@ -116,13 +113,6 @@ kubernetesMasterConfig: - v1beta3 - v1 {% endif %} - admissionConfig: -{% if 'kube_admission_plugin_order' in openshift.master %} - pluginOrderOverride:{{ openshift.master.kube_admission_plugin_order | to_padded_yaml(level=3) }} -{% endif %} -{% if 'kube_admission_plugin_config' in openshift.master %} - pluginConfig:{{ openshift.master.kube_admission_plugin_config | to_padded_yaml(level=3) }} -{% endif %} apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_padded_yaml( level=2 ) }} controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }} masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }} |