From 06609c31809cb1d2f5529b009711344e1b23edc2 Mon Sep 17 00:00:00 2001 From: James Gu Date: Mon, 12 Apr 2021 17:42:18 -0700 Subject: [PATCH] Added script for the missing controlplane_target phase controlplane_target phase is needed for target cluster more than a single node Signed-off-by: James Gu Change-Id: I6e77d4268cdee0ebcc65e1f9172ef645ced53337 --- docs/source/developers.md | 2 +- playbooks/airshipctl-gate-runner.yaml | 6 +-- .../runner/assets/entrypoint.sh | 6 +-- .../34_deploy_controlplane_target.sh | 37 +++++++++++++++++++ ...orker_node.sh => 35_deploy_worker_node.sh} | 0 ...ploy_workload.sh => 36_deploy_workload.sh} | 0 ...profiles.sh => 37_verify_hwcc_profiles.sh} | 0 zuul.d/jobs.yaml | 8 ++-- 8 files changed, 48 insertions(+), 11 deletions(-) create mode 100755 tools/deployment/34_deploy_controlplane_target.sh rename tools/deployment/{34_deploy_worker_node.sh => 35_deploy_worker_node.sh} (100%) rename tools/deployment/{35_deploy_workload.sh => 36_deploy_workload.sh} (100%) rename tools/deployment/{36_verify_hwcc_profiles.sh => 37_verify_hwcc_profiles.sh} (100%) diff --git a/docs/source/developers.md b/docs/source/developers.md index 87ad7be48..4b085ef70 100644 --- a/docs/source/developers.md +++ b/docs/source/developers.md @@ -278,7 +278,7 @@ Make sure the following conditions are met: 8. How to deploy Workloads Once the Target is Operational, Workloads can be deployed on the Target Cluster. - A small demo workload can be deployed using ./tools/deployment/35_deploy_workload.sh.This demo includes ingress as a workload. + A small demo workload can be deployed using ./tools/deployment/36_deploy_workload.sh.This demo includes ingress as a workload. To verify execute kubectl command as below: ```Markdown $ kubectl --kubeconfig /home/user/.airship/kubeconfig --context target-cluster get pods -n ingress diff --git a/playbooks/airshipctl-gate-runner.yaml b/playbooks/airshipctl-gate-runner.yaml index 915de923c..c191b6500 100644 --- a/playbooks/airshipctl-gate-runner.yaml +++ b/playbooks/airshipctl-gate-runner.yaml @@ -44,9 +44,9 @@ - ./tools/deployment/31_deploy_initinfra_target_node.sh - ./tools/deployment/32_cluster_init_target_node.sh - ./tools/deployment/33_cluster_move_target_node.sh - - ./tools/deployment/34_deploy_worker_node.sh - - ./tools/deployment/35_deploy_workload.sh - - ./tools/deployment/36_verify_hwcc_profiles.sh + - ./tools/deployment/35_deploy_worker_node.sh + - ./tools/deployment/36_deploy_workload.sh + - ./tools/deployment/37_verify_hwcc_profiles.sh - name: "Run gate scripts" include_role: diff --git a/tools/airship-in-a-pod/runner/assets/entrypoint.sh b/tools/airship-in-a-pod/runner/assets/entrypoint.sh index e6aa231c5..c6483fe69 100755 --- a/tools/airship-in-a-pod/runner/assets/entrypoint.sh +++ b/tools/airship-in-a-pod/runner/assets/entrypoint.sh @@ -63,8 +63,8 @@ fi ./tools/deployment/31_deploy_initinfra_target_node.sh ./tools/deployment/32_cluster_init_target_node.sh ./tools/deployment/33_cluster_move_target_node.sh -./tools/deployment/34_deploy_worker_node.sh -./tools/deployment/35_deploy_workload.sh -./tools/deployment/36_verify_hwcc_profiles.sh +./tools/deployment/35_deploy_worker_node.sh +./tools/deployment/36_deploy_workload.sh +./tools/deployment/37_verify_hwcc_profiles.sh /signal_complete runner diff --git a/tools/deployment/34_deploy_controlplane_target.sh b/tools/deployment/34_deploy_controlplane_target.sh new file mode 100755 index 000000000..872777575 --- /dev/null +++ b/tools/deployment/34_deploy_controlplane_target.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +# 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. + +set -ex + +export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"} +export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"} + +echo "Create target k8s cluster resources" +airshipctl phase run controlplane-target --debug + +echo "List all nodes in target cluster" +kubectl \ + --kubeconfig $KUBECONFIG \ + --context $KUBECONFIG_TARGET_CONTEXT \ + --request-timeout 10s \ + get node + + +echo "List all pods in target cluster" +kubectl \ + --kubeconfig $KUBECONFIG \ + --context $KUBECONFIG_TARGET_CONTEXT \ + --request-timeout 10s \ + get pods \ + --all-namespaces diff --git a/tools/deployment/34_deploy_worker_node.sh b/tools/deployment/35_deploy_worker_node.sh similarity index 100% rename from tools/deployment/34_deploy_worker_node.sh rename to tools/deployment/35_deploy_worker_node.sh diff --git a/tools/deployment/35_deploy_workload.sh b/tools/deployment/36_deploy_workload.sh similarity index 100% rename from tools/deployment/35_deploy_workload.sh rename to tools/deployment/36_deploy_workload.sh diff --git a/tools/deployment/36_verify_hwcc_profiles.sh b/tools/deployment/37_verify_hwcc_profiles.sh similarity index 100% rename from tools/deployment/36_verify_hwcc_profiles.sh rename to tools/deployment/37_verify_hwcc_profiles.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 9c06ac081..422f2f575 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -140,9 +140,9 @@ - ./tools/deployment/31_deploy_initinfra_target_node.sh - ./tools/deployment/32_cluster_init_target_node.sh - ./tools/deployment/33_cluster_move_target_node.sh - - ./tools/deployment/34_deploy_worker_node.sh - - ./tools/deployment/35_deploy_workload.sh - - ./tools/deployment/36_verify_hwcc_profiles.sh + - ./tools/deployment/35_deploy_worker_node.sh + - ./tools/deployment/36_deploy_workload.sh + - ./tools/deployment/37_verify_hwcc_profiles.sh serve_dir: /srv/images serve_port: 8099 log_roles: @@ -190,7 +190,7 @@ - ./tools/deployment/provider_common/30_deploy_controlplane.sh - ./tools/deployment/provider_common/32_cluster_init_target_node.sh - ./tools/deployment/provider_common/33_cluster_move_target_node.sh - - ./tools/deployment/provider_common/34_deploy_worker_node.sh + - ./tools/deployment/provider_common/35_deploy_worker_node.sh voting: false - job: name: airship-airshipctl-docker-kubebench-conformance