From 07a0040c8c625159eb1688ebd9f4ddd9a6d1a62d Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Wed, 26 Feb 2020 12:27:55 -0500 Subject: [PATCH] [#70] Update k8s gates to use kubectl Gates previously used airshipctl kubectl version, but the kubectl subcommand is being removed. Change-Id: Ie2caf03da3f49346eef95bb6d5d61df43a6a82eb --- playbooks/airship-airshipctl-functional-existing-k8s.yaml | 2 +- roles/airshipctl-deploy-ephemeral-node/tasks/main.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/airship-airshipctl-functional-existing-k8s.yaml b/playbooks/airship-airshipctl-functional-existing-k8s.yaml index d116fbeb5..fe04a41b3 100644 --- a/playbooks/airship-airshipctl-functional-existing-k8s.yaml +++ b/playbooks/airship-airshipctl-functional-existing-k8s.yaml @@ -34,6 +34,6 @@ - name: "airshipctl kubectl version" shell: | set -ex - airshipctl kubectl version + kubectl version args: chdir: "{{ zuul.project.src_dir }}" diff --git a/roles/airshipctl-deploy-ephemeral-node/tasks/main.yaml b/roles/airshipctl-deploy-ephemeral-node/tasks/main.yaml index 458807e08..62ff79921 100644 --- a/roles/airshipctl-deploy-ephemeral-node/tasks/main.yaml +++ b/roles/airshipctl-deploy-ephemeral-node/tasks/main.yaml @@ -16,9 +16,9 @@ - name: check airshipctl kubectl version command: >- - timeout 20 airshipctl \ + timeout 20 kubectl \ --kubeconfig {{ airshipctl_config_dir_default | default(ansible_env.HOME) }}/.airship/kubeconfig \ - kubectl version + version register: airship_kubecofig_version retries: 50 delay: 20