From ab02dee4e0b08585a0c532f576bf0e935e713c58 Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Fri, 28 May 2021 08:32:12 -0500 Subject: [PATCH] Add workload-config-target phase Change-Id: I41f1e8e36321d2ac13a7947a635c41f81eded0b0 --- manifests/type/multi-tenant/phases/phases.yaml | 12 ++++++++++++ ...ploy_workload.sh => 360_deploy_workload.sh} | 0 .../multi-tenant/361_deploy_workload_config.sh | 18 ++++++++++++++++++ zuul.d/jobs.yaml | 3 ++- 4 files changed, 32 insertions(+), 1 deletion(-) rename tools/deployment/multi-tenant/{36_deploy_workload.sh => 360_deploy_workload.sh} (100%) create mode 100755 tools/deployment/multi-tenant/361_deploy_workload_config.sh diff --git a/manifests/type/multi-tenant/phases/phases.yaml b/manifests/type/multi-tenant/phases/phases.yaml index 998802038..e297c50dc 100644 --- a/manifests/type/multi-tenant/phases/phases.yaml +++ b/manifests/type/multi-tenant/phases/phases.yaml @@ -21,3 +21,15 @@ config: kind: GenericContainer name: calicoctl-delete documentEntryPoint: target/workload/network-policy +--- +apiVersion: airshipit.org/v1alpha1 +kind: Phase +metadata: + name: workload-config-target + clusterName: target-cluster +config: + executorRef: + apiVersion: airshipit.org/v1alpha1 + kind: KubernetesApply + name: kubernetes-apply + documentEntryPoint: target/workload-config diff --git a/tools/deployment/multi-tenant/36_deploy_workload.sh b/tools/deployment/multi-tenant/360_deploy_workload.sh similarity index 100% rename from tools/deployment/multi-tenant/36_deploy_workload.sh rename to tools/deployment/multi-tenant/360_deploy_workload.sh diff --git a/tools/deployment/multi-tenant/361_deploy_workload_config.sh b/tools/deployment/multi-tenant/361_deploy_workload_config.sh new file mode 100755 index 000000000..7e42070b0 --- /dev/null +++ b/tools/deployment/multi-tenant/361_deploy_workload_config.sh @@ -0,0 +1,18 @@ +#!/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 -xe + +echo "Deploy workload-config" +airshipctl phase run workload-config-target --debug diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index e425f3910..ed11fab09 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -105,7 +105,8 @@ - ./tools/deployment/multi-tenant/32_cluster_init_target_node.sh - ./tools/deployment/multi-tenant/33_cluster_move_target_node.sh - ./tools/deployment/multi-tenant/35_deploy_worker_node.sh - - ./tools/deployment/multi-tenant/36_deploy_workload.sh + - ./tools/deployment/multi-tenant/360_deploy_workload.sh + - ./tools/deployment/multi-tenant/361_deploy_workload_config.sh files: - ^manifests/site/virtual-network-cloud/.*$ - ^manifests/type/multi-tenant/.*$