Align treasuremap to image-builder

This trues up treasuremap to the airshipctl change below, which changes
configuration (and naming conventions) to match the new image-builder
that can be used for both iso and qcow generation.

https://review.opendev.org/c/airship/airshipctl/+/758782

Change-Id: I821fda77da899af667a22033281f44dd2dd82a31
Closes: 72
This commit is contained in:
Matt McEuen 2020-12-23 17:01:21 -06:00
parent dc5efc7130
commit 876f1ae754
4 changed files with 9 additions and 11 deletions

View File

@ -19,16 +19,14 @@ move-options: {}
action: move action: move
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: ImageConfiguration kind: IsoConfiguration
metadata: metadata:
name: isogen name: isogen
labels: labels:
airshipit.org/deploy-k8s: "false" airshipit.org/deploy-k8s: "false"
builder: builder:
networkConfigFileName: network-config outputFileName: ephemeral.iso
outputMetadataFileName: output-metadata.yaml
userDataFileName: user-data
container: container:
containerRuntime: docker containerRuntime: docker
image: quay.io/airshipit/isogen:latest-ubuntu_focal image: quay.io/airshipit/image-builder:latest-ubuntu_focal
volume: /srv/iso:/config volume: /srv/images:/config

View File

@ -2,11 +2,11 @@
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: Phase kind: Phase
metadata: metadata:
name: bootstrap name: bootstrap-iso
config: config:
executorRef: executorRef:
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: ImageConfiguration kind: IsoConfiguration
name: isogen name: isogen
documentEntryPoint: ephemeral/bootstrap documentEntryPoint: ephemeral/bootstrap
--- ---

View File

@ -17,5 +17,5 @@ set -xe
: ${AIRSHIPCTL_PROJECT:="../airshipctl"} : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
cd ${AIRSHIPCTL_PROJECT} cd ${AIRSHIPCTL_PROJECT}
./tools/deployment/24_build_ephemeral_iso.sh ./tools/deployment/24_build_images.sh

View File

@ -70,7 +70,7 @@
- ./tools/deployment/01_install_kubectl.sh - ./tools/deployment/01_install_kubectl.sh
- ./tools/deployment/22_test_configs.sh - ./tools/deployment/22_test_configs.sh
- ./tools/deployment/23_pull_documents.sh - ./tools/deployment/23_pull_documents.sh
- ./tools/deployment/24_build_ephemeral_iso.sh - ./tools/deployment/24_build_images.sh
- ./tools/deployment/25_deploy_ephemeral_node.sh - ./tools/deployment/25_deploy_ephemeral_node.sh
- ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh - ./tools/deployment/26_deploy_metal3_capi_ephemeral_node.sh
- ./tools/deployment/30_deploy_controlplane.sh - ./tools/deployment/30_deploy_controlplane.sh
@ -81,7 +81,7 @@
# functional. # functional.
# - ./tools/deployment/34_deploy_worker_node.sh # - ./tools/deployment/34_deploy_worker_node.sh
- ./tools/deployment/35_deploy_workload.sh - ./tools/deployment/35_deploy_workload.sh
serve_dir: /srv/iso serve_dir: /srv/images
serve_port: 8099 serve_port: 8099
voting: false voting: false