From d81385aed064c83208517bc13d31948a51d2cc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Str=C3=A4hle?= Date: Mon, 4 Nov 2024 23:07:14 +0100 Subject: [PATCH] Rename group in approvaltest --- .../crd/generator/approvaltests/CRDGeneratorApprovalTest.java | 2 +- .../crd/generator/approvaltests/validation/Validation.java | 2 +- ...pprovalTest.validations.sample.fabric8.io.v1.approved.yml} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/{CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml => CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml} (99%) diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java index ea60607936c..1cf82989d17 100644 --- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java +++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.java @@ -184,7 +184,7 @@ static Stream crdApprovalCasesApiV2(String crdVersion) { for (boolean parallel : new boolean[] { false, true }) { cases.add(new TestCase("printercolumns.sample.fabric8.io", crdVersion, parallel, PrinterColumn.class)); cases.add(new TestCase("selectablefields.sample.fabric8.io", crdVersion, parallel, SelectableField.class)); - cases.add(new TestCase("validations.samples.fabric8.io", crdVersion, parallel, Validation.class)); + cases.add(new TestCase("validations.sample.fabric8.io", crdVersion, parallel, Validation.class)); } return cases.stream(); } diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java index bc77956e814..6a03c467811 100644 --- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java +++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/approvaltests/validation/Validation.java @@ -20,6 +20,6 @@ import io.fabric8.kubernetes.model.annotation.Version; @Version("v1alpha1") -@Group("samples.fabric8.io") +@Group("sample.fabric8.io") public class Validation extends CustomResource { } diff --git a/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml b/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml similarity index 99% rename from crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml rename to crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml index a67600a5760..3c600e80ec6 100644 --- a/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.samples.fabric8.io.v1.approved.yml +++ b/crd-generator/test/src/test/resources/io/fabric8/crd/generator/approvaltests/CRDGeneratorApprovalTest.approvalTest.validations.sample.fabric8.io.v1.approved.yml @@ -2,9 +2,9 @@ apiVersion: "apiextensions.k8s.io/v1" kind: "CustomResourceDefinition" metadata: - name: "validations.samples.fabric8.io" + name: "validations.sample.fabric8.io" spec: - group: "samples.fabric8.io" + group: "sample.fabric8.io" names: kind: "Validation" plural: "validations"