Merge pull request #6948 from shanemcd/fix-oc-4.3

Fix installer for oc 4.3

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-05-07 00:46:03 +00:00 committed by GitHub
commit b9e45e62c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View File

@ -1,4 +1,12 @@
---
- 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

View File

@ -1,3 +1,3 @@
---
openshift_oc_config_file: "{{ kubernetes_base_path }}/.kube/config"
openshift_oc_bin: "oc --config={{ openshift_oc_config_file }}"
openshift_oc_bin: "oc {{ oc_kubeconfig_option }}={{ openshift_oc_config_file }}"