[#70] Resolve kubectl gate errors

In [0] the kubectl subcommand was removed from airshipctl, which is
now causing gates [1] and [2] to fail. This change addresses these
failures by ensuring kubectl is installed via curl, and that kubectl
commands are run in place of the original airshipctl kubectl commands.

[0] https://review.opendev.org/#/c/710094/
[1] https://zuul.opendev.org/t/openstack/job/airship-airshipctl-functional-existing-k8s
[2] https://zuul.opendev.org/t/openstack/job/airship-airshipctl-gate-test

Relates-To: #70

Change-Id: I03b3420588a4abb5cd24fdc62a07019783a40557
Signed-off-by: Alexander Hughes <Alexander.Hughes@pm.me>
This commit is contained in:
Alexander Hughes 2020-03-02 12:47:42 -05:00
parent 26fdd05b0f
commit ea0dd64935
6 changed files with 27 additions and 3 deletions

View File

@ -12,4 +12,4 @@
- hosts: primary - hosts: primary
roles: roles:
- install-kubernetes - install-kubectl

View File

@ -11,6 +11,9 @@
# limitations under the License. # limitations under the License.
- hosts: primary - hosts: primary
roles:
- install-docker
- install-kubectl
tasks: tasks:
- name: "Build and install airshipctl" - name: "Build and install airshipctl"
block: block:

View File

@ -20,6 +20,7 @@
- airshipctl-systemwide-executable - airshipctl-systemwide-executable
- airshipctl-test-configs - airshipctl-test-configs
- airshipctl-build-ephemeral-iso - airshipctl-build-ephemeral-iso
- install-kubectl
- airshipctl-deploy-ephemeral-node - airshipctl-deploy-ephemeral-node
var_files_default: var_files_default:
- local-dev.yaml - local-dev.yaml

View File

@ -0,0 +1,19 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: install kubectl binary
shell: |
curl -sSLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.16.2/bin/linux/amd64/kubectl
chmod +x /usr/local/bin/kubectl
become: yes
args:
warn: false

View File

@ -86,6 +86,7 @@
- airshipctl-systemwide-executable - airshipctl-systemwide-executable
- airshipctl-test-configs - airshipctl-test-configs
- airshipctl-build-ephemeral-iso - airshipctl-build-ephemeral-iso
- install-kubectl
- airshipctl-deploy-ephemeral-node - airshipctl-deploy-ephemeral-node
serve_dir: /srv/iso serve_dir: /srv/iso
serve_port: 8099 serve_port: 8099

View File

@ -22,14 +22,14 @@
- airship-airshipctl-build-docs - airship-airshipctl-build-docs
- airship-airshipctl-lint-unit - airship-airshipctl-lint-unit
- airship-airshipctl-build-image - airship-airshipctl-build-image
- airship-airshipctl-functional-existing-k8s # - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
- airship-airshipctl-gate-test - airship-airshipctl-gate-test
gate: gate:
jobs: jobs:
- airship-airshipctl-build-docs - airship-airshipctl-build-docs
- airship-airshipctl-lint-unit - airship-airshipctl-lint-unit
- airship-airshipctl-build-image - airship-airshipctl-build-image
- airship-airshipctl-functional-existing-k8s # - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
- airship-airshipctl-gate-test - airship-airshipctl-gate-test
post: post:
jobs: jobs: