Browse Source

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
changes/74/768374/1
Matt McEuen 2 years ago
parent
commit
876f1ae754
  1. 10
      manifests/type/airship-core/phases/executors.yaml
  2. 4
      manifests/type/airship-core/phases/phases.yaml
  3. 2
      tools/deployment/24_build_images.sh
  4. 4
      zuul.d/jobs.yaml

10
manifests/type/airship-core/phases/executors.yaml

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

4
manifests/type/airship-core/phases/phases.yaml

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

2
tools/deployment/24_build_ephemeral_iso.sh → tools/deployment/24_build_images.sh

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

4
zuul.d/jobs.yaml

@ -70,7 +70,7 @@
- ./tools/deployment/01_install_kubectl.sh
- ./tools/deployment/22_test_configs.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/26_deploy_metal3_capi_ephemeral_node.sh
- ./tools/deployment/30_deploy_controlplane.sh
@ -81,7 +81,7 @@
# functional.
# - ./tools/deployment/34_deploy_worker_node.sh
- ./tools/deployment/35_deploy_workload.sh
serve_dir: /srv/iso
serve_dir: /srv/images
serve_port: 8099
voting: false

Loading…
Cancel
Save