From 0f0e401c98ae8ba89a380374ea8a4112f1fff1cf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 29 May 2020 13:41:49 -0400 Subject: [PATCH] Hardcode --kubeconfig and therefore only support OpenShift 3.11+ Avoid trying to parse inconsitent oc --version output --- installer/roles/kubernetes/tasks/openshift_auth.yml | 8 -------- installer/roles/kubernetes/vars/openshift.yml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/installer/roles/kubernetes/tasks/openshift_auth.yml b/installer/roles/kubernetes/tasks/openshift_auth.yml index 084e20c482..1b53cda59a 100644 --- a/installer/roles/kubernetes/tasks/openshift_auth.yml +++ b/installer/roles/kubernetes/tasks/openshift_auth.yml @@ -1,12 +1,4 @@ --- -- name: Determine version of oc - shell: oc version | sed -n 's/oc v//p' - register: oc_version - -- name: Use correct cli option for kubeconfig - set_fact: - oc_kubeconfig_option: "{{ '--kubeconfig' if oc_version.stdout is version('3.11', '>=') else '--config' }}" - - include_vars: openshift.yml - name: Set kubernetes_namespace diff --git a/installer/roles/kubernetes/vars/openshift.yml b/installer/roles/kubernetes/vars/openshift.yml index 1104914fb8..6e1fd30a3c 100644 --- a/installer/roles/kubernetes/vars/openshift.yml +++ b/installer/roles/kubernetes/vars/openshift.yml @@ -1,3 +1,3 @@ --- openshift_oc_config_file: "{{ kubernetes_base_path }}/.kube/config" -openshift_oc_bin: "oc {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}" +openshift_oc_bin: "oc --kubeconfig={{ openshift_oc_config_file }}"