From 9a797a0d70034cb2e9a40c990bfc64344db33a7e Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Mon, 3 May 2021 12:44:58 -0500 Subject: [PATCH] Fix catalogue layout for rook-ceph-tools and ceph-versions replacement Change-Id: Ie40ff1e5ab7c2436a4688a022a4769d69690080d Signed-off-by: Andrii Ostapenko --- .../treasuremap-base-catalogues/versions-treasuremap.yaml | 1 - .../target/workload/storage/rook/replacements/versions.yaml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index 0921ee743..a684e8dd5 100644 --- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml +++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml @@ -116,7 +116,6 @@ spec: ceph: ceph-version: image: ceph/ceph:v15.2.10 - rook-ceph-tools: rook-ceph-tools: image: rook/ceph:v1.5.9 diff --git a/manifests/type/airship-core/target/workload/storage/rook/replacements/versions.yaml b/manifests/type/airship-core/target/workload/storage/rook/replacements/versions.yaml index ea5e6ccd7..d2c5f9688 100644 --- a/manifests/type/airship-core/target/workload/storage/rook/replacements/versions.yaml +++ b/manifests/type/airship-core/target/workload/storage/rook/replacements/versions.yaml @@ -22,9 +22,9 @@ replacements: objref: kind: VersionsCatalogue name: versions-treasuremap - fieldref: "{.spec.images.storage-rook.ceph.ceph.ceph-version.image}" + fieldref: "{.spec.images.storage-rook.ceph.ceph-version.image}" target: objref: kind: CephCluster name: ceph - fieldrefs: ["{.spec.cephVersion.image}"] \ No newline at end of file + fieldrefs: ["{.spec.cephVersion.image}"]