From 339f6dbc9784d8dc14ebfc33f74e2a09c0d5abe9 Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Mon, 31 Aug 2020 17:03:31 -0500 Subject: [PATCH] Consume the infra composite in the initinfra phase This follows from the work done in airshipctl to deploy calico CNI via a kustomize entrypoint: https://review.opendev.org/#/c/743763/ https://review.opendev.org/#/c/743402/ Change-Id: I03089214be1ae87926ba8c997c03511a6d8fb0a5 --- .../type/airship-core/ephemeral/initinfra/kustomization.yaml | 1 + manifests/type/airship-core/target/initinfra/kustomization.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/type/airship-core/ephemeral/initinfra/kustomization.yaml b/manifests/type/airship-core/ephemeral/initinfra/kustomization.yaml index 4dc0a8bd6..0c8f50672 100644 --- a/manifests/type/airship-core/ephemeral/initinfra/kustomization.yaml +++ b/manifests/type/airship-core/ephemeral/initinfra/kustomization.yaml @@ -1,5 +1,6 @@ resources: - ../../shared/clusterctl + - ../../../../../../airshipctl/manifests/composite/infra/ - ../../../../../../airshipctl/manifests/function/baremetal-operator/ commonLabels: airshipit.org/stage: initinfra diff --git a/manifests/type/airship-core/target/initinfra/kustomization.yaml b/manifests/type/airship-core/target/initinfra/kustomization.yaml index 5c5737429..8060ed121 100644 --- a/manifests/type/airship-core/target/initinfra/kustomization.yaml +++ b/manifests/type/airship-core/target/initinfra/kustomization.yaml @@ -1,5 +1,6 @@ resources: - ../../shared/clusterctl + - ../../../../../../airshipctl/manifests/composite/infra/ - ../../../../../../airshipctl/manifests/function/baremetal-operator/ - ../../../../../../airshipctl/manifests/function/helm-operator/ commonLabels: