From 1b66dbbd8b07cddd0941d008b2ebc50110182eb6 Mon Sep 17 00:00:00 2001 From: Bikouo Aubin <79859644+abikouo@users.noreply.github.com> Date: Thu, 20 Oct 2022 08:40:32 +0200 Subject: [PATCH] v1beta replaced with v1 for CRD (#532) v1beta replaced with v1 for CRD SUMMARY fixes k8s_crd test ISSUE TYPE Bugfix Pull Request Reviewed-by: Mike Graves --- .../532-k8s_crd-fix-integration-test.yml | 2 + .../targets/k8s_crd/files/setup-crd.yml | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/532-k8s_crd-fix-integration-test.yml diff --git a/changelogs/fragments/532-k8s_crd-fix-integration-test.yml b/changelogs/fragments/532-k8s_crd-fix-integration-test.yml new file mode 100644 index 00000000..72f539ba --- /dev/null +++ b/changelogs/fragments/532-k8s_crd-fix-integration-test.yml @@ -0,0 +1,2 @@ +trivial: + - fix k8s_crd integration test, use apiextensions.k8s.io/v1 instead apiextensions.k8s.io/v1beta as apiVersion for CustomResourceDefinition. (https://github.com/ansible-collections/kubernetes.core/pull/532). diff --git a/tests/integration/targets/k8s_crd/files/setup-crd.yml b/tests/integration/targets/k8s_crd/files/setup-crd.yml index 9c01bc1a..15debdbd 100644 --- a/tests/integration/targets/k8s_crd/files/setup-crd.yml +++ b/tests/integration/targets/k8s_crd/files/setup-crd.yml @@ -1,11 +1,49 @@ --- -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: certificates.certmanager.k8s.io + annotations: + "api-approved.kubernetes.io": "https://github.com/kubernetes/kubernetes/pull/78458" spec: group: certmanager.k8s.io - version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + certificate: + type: string + secretName: + type: string + dnsNames: + type: array + items: + type: string + acme: + type: object + properties: + config: + type: array + items: + type: object + properties: + ingressClass: + type: string + domains: + type: array + items: + type: string + issuerRef: + type: object + properties: + name: + type: string + kind: + type: string scope: Namespaced names: kind: Certificate