From 43139b3737f2b4940a00b7a300e55f4e79530573 Mon Sep 17 00:00:00 2001 From: Johannes Scheuermann Date: Tue, 16 Jul 2024 09:13:49 +0200 Subject: [PATCH] Update examples for imageType setting (#2102) * Update examples for imageType setting --- config/samples/backup.yaml | 2 ++ config/samples/client.yaml | 1 + config/samples/cluster.yaml | 1 + config/samples/restore.yaml | 2 ++ config/tests/backup/base/backup.yaml | 1 + config/tests/base/cluster.yaml | 1 + config/tests/multi_dc/final.yaml | 1 + config/tests/multi_dc/stage_1.yaml | 1 + config/tests/multi_kc/final.yaml | 1 + config/tests/multi_kc/stage_1.yaml | 1 + config/tests/three_data_hall/final.yaml | 1 + config/tests/three_data_hall/stage_1.yaml | 1 + config/tests/unified_image/images.yaml | 4 ++-- 13 files changed, 16 insertions(+), 2 deletions(-) diff --git a/config/samples/backup.yaml b/config/samples/backup.yaml index 4d7b0ff87..7ab6714ef 100644 --- a/config/samples/backup.yaml +++ b/config/samples/backup.yaml @@ -6,6 +6,7 @@ spec: blobStoreConfiguration: accountName: minio@minio-service:9000 clusterName: test-cluster + imageType: split podTemplateSpec: spec: containers: @@ -65,6 +66,7 @@ spec: enabled: true faultDomain: key: foundationdb.org/none + imageType: split labels: filterOnOwnerReference: false matchLabels: diff --git a/config/samples/client.yaml b/config/samples/client.yaml index 3b2c17be1..bf27ed644 100644 --- a/config/samples/client.yaml +++ b/config/samples/client.yaml @@ -77,6 +77,7 @@ spec: enabled: true faultDomain: key: foundationdb.org/none + imageType: split labels: filterOnOwnerReference: false matchLabels: diff --git a/config/samples/cluster.yaml b/config/samples/cluster.yaml index ee18c58b0..59cbfbd27 100644 --- a/config/samples/cluster.yaml +++ b/config/samples/cluster.yaml @@ -8,6 +8,7 @@ spec: enabled: true faultDomain: key: foundationdb.org/none + imageType: split labels: filterOnOwnerReference: false matchLabels: diff --git a/config/samples/restore.yaml b/config/samples/restore.yaml index 9b16cd4b2..757cee954 100644 --- a/config/samples/restore.yaml +++ b/config/samples/restore.yaml @@ -7,6 +7,7 @@ spec: blobStoreConfiguration: accountName: minio@minio-service:9000 clusterName: test-cluster + imageType: split podTemplateSpec: spec: containers: @@ -66,6 +67,7 @@ spec: enabled: true faultDomain: key: foundationdb.org/none + imageType: split labels: filterOnOwnerReference: false matchLabels: diff --git a/config/tests/backup/base/backup.yaml b/config/tests/backup/base/backup.yaml index 30bb2ce67..d075fe224 100644 --- a/config/tests/backup/base/backup.yaml +++ b/config/tests/backup/base/backup.yaml @@ -6,6 +6,7 @@ spec: version: 7.1.26 clusterName: test-cluster snapshotPeriodSeconds: 3600 + imageType: split blobStoreConfiguration: accountName: minio@minio-service:9000 podTemplateSpec: diff --git a/config/tests/base/cluster.yaml b/config/tests/base/cluster.yaml index e116dfe45..9b0d425fe 100644 --- a/config/tests/base/cluster.yaml +++ b/config/tests/base/cluster.yaml @@ -33,6 +33,7 @@ spec: automationOptions: replacements: enabled: true + imageType: split processes: general: customParameters: diff --git a/config/tests/multi_dc/final.yaml b/config/tests/multi_dc/final.yaml index ea0eda8c0..5ddef3a28 100644 --- a/config/tests/multi_dc/final.yaml +++ b/config/tests/multi_dc/final.yaml @@ -10,6 +10,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$dc spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/none diff --git a/config/tests/multi_dc/stage_1.yaml b/config/tests/multi_dc/stage_1.yaml index 0a231de43..3c353905a 100644 --- a/config/tests/multi_dc/stage_1.yaml +++ b/config/tests/multi_dc/stage_1.yaml @@ -10,6 +10,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$dc spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/none diff --git a/config/tests/multi_kc/final.yaml b/config/tests/multi_kc/final.yaml index 516ce5586..91a0b7ac1 100644 --- a/config/tests/multi_kc/final.yaml +++ b/config/tests/multi_kc/final.yaml @@ -10,6 +10,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$zone spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/kubernetes-cluster diff --git a/config/tests/multi_kc/stage_1.yaml b/config/tests/multi_kc/stage_1.yaml index 1fa30f42a..8fd4a7ad7 100644 --- a/config/tests/multi_kc/stage_1.yaml +++ b/config/tests/multi_kc/stage_1.yaml @@ -10,6 +10,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$zone spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/kubernetes-cluster diff --git a/config/tests/three_data_hall/final.yaml b/config/tests/three_data_hall/final.yaml index 96df4add6..65bdb69e1 100644 --- a/config/tests/three_data_hall/final.yaml +++ b/config/tests/three_data_hall/final.yaml @@ -9,6 +9,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$az spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/none diff --git a/config/tests/three_data_hall/stage_1.yaml b/config/tests/three_data_hall/stage_1.yaml index 5e272ff13..d0351afe6 100644 --- a/config/tests/three_data_hall/stage_1.yaml +++ b/config/tests/three_data_hall/stage_1.yaml @@ -9,6 +9,7 @@ metadata: cluster-group: test-cluster name: test-cluster-$az spec: + imageType: split version: 7.1.26 faultDomain: key: foundationdb.org/none diff --git a/config/tests/unified_image/images.yaml b/config/tests/unified_image/images.yaml index 0d9e06ff7..045daa942 100644 --- a/config/tests/unified_image/images.yaml +++ b/config/tests/unified_image/images.yaml @@ -1,6 +1,6 @@ - op: add - path: "/spec/useUnifiedImage" - value: true + path: "/spec/imageType" + value: unified - op: add path: "/spec/mainContainer" value: