From 6265c1fe753f97503957226268a88a4068f0ceeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Ho=C3=9F?= Date: Sat, 4 Nov 2023 11:46:17 +0100 Subject: [PATCH] use unversioned nginx CRDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastian Hoß --- code-generator/src/catalog.rs | 24 +++++++++---------- .../k8s.nginx.org/v1/virtualservers.yaml | 2 ++ .../src/k8s_nginx_org_v1/virtualservers.rs | 2 ++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/code-generator/src/catalog.rs b/code-generator/src/catalog.rs index 755583f87..75b4ca5fc 100644 --- a/code-generator/src/catalog.rs +++ b/code-generator/src/catalog.rs @@ -1335,18 +1335,18 @@ pub const CRD_V1_SOURCES: &'static [UpstreamSource] = &[ project_name: "nginxinc/kubernetes-ingress", license: APACHE_V2, urls: &[ - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotect.f5.com_aplogconfs.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotect.f5.com_appolicies.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotect.f5.com_apusersigs.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotectdos.f5.com_apdoslogconfs.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotectdos.f5.com_apdospolicy.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/externaldns.nginx.org_dnsendpoints.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/k8s.nginx.org_globalconfigurations.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/k8s.nginx.org_policies.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/k8s.nginx.org_transportservers.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/k8s.nginx.org_virtualserverroutes.yaml", - "https://github.com/nginxinc/kubernetes-ingress/blob/v3.3.0/deployments/common/crds/k8s.nginx.org_virtualservers.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotect.f5.com_aplogconfs.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotect.f5.com_appolicies.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotect.f5.com_apusersigs.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotectdos.f5.com_apdoslogconfs.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotectdos.f5.com_apdospolicy.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/appprotectdos.f5.com_dosprotectedresources.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/externaldns.nginx.org_dnsendpoints.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/k8s.nginx.org_globalconfigurations.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/k8s.nginx.org_policies.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/k8s.nginx.org_transportservers.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/k8s.nginx.org_virtualserverroutes.yaml", + "https://github.com/nginxinc/kubernetes-ingress/blob/main/config/crd/bases/k8s.nginx.org_virtualservers.yaml", ], }, UpstreamSource { diff --git a/crd-catalog/nginxinc/kubernetes-ingress/k8s.nginx.org/v1/virtualservers.yaml b/crd-catalog/nginxinc/kubernetes-ingress/k8s.nginx.org/v1/virtualservers.yaml index a95b151d4..d5fc811b3 100644 --- a/crd-catalog/nginxinc/kubernetes-ingress/k8s.nginx.org/v1/virtualservers.yaml +++ b/crd-catalog/nginxinc/kubernetes-ingress/k8s.nginx.org/v1/virtualservers.yaml @@ -531,6 +531,8 @@ spec: type: string duration: type: string + issue-temp-cert: + type: boolean issuer: type: string issuer-group: diff --git a/kube-custom-resources-rs/src/k8s_nginx_org_v1/virtualservers.rs b/kube-custom-resources-rs/src/k8s_nginx_org_v1/virtualservers.rs index 3c1cd330b..843b1ace2 100644 --- a/kube-custom-resources-rs/src/k8s_nginx_org_v1/virtualservers.rs +++ b/kube-custom-resources-rs/src/k8s_nginx_org_v1/virtualservers.rs @@ -610,6 +610,8 @@ pub struct VirtualServerTlsCertManager { pub common_name: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub duration: Option, + #[serde(default, skip_serializing_if = "Option::is_none", rename = "issue-temp-cert")] + pub issue_temp_cert: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub issuer: Option, #[serde(default, skip_serializing_if = "Option::is_none", rename = "issuer-group")]