From 88141f7c492ae96fc25e1c433cac5f4c233f4e93 Mon Sep 17 00:00:00 2001 From: nginx-bot Date: Mon, 20 Sep 2021 22:16:59 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20Synced=20file(s)=20with=20nginxi?= =?UTF-8?q?nc/kubernetes-ingress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../k8s.nginx.org_globalconfigurations.yaml | 2 +- config/crd/kic/k8s.nginx.org_policies.yaml | 98 ++++++++++++++++++- .../kic/k8s.nginx.org_transportservers.yaml | 2 +- .../k8s.nginx.org_virtualserverroutes.yaml | 4 +- .../crd/kic/k8s.nginx.org_virtualservers.yaml | 4 +- 5 files changed, 105 insertions(+), 5 deletions(-) diff --git a/config/crd/kic/k8s.nginx.org_globalconfigurations.yaml b/config/crd/kic/k8s.nginx.org_globalconfigurations.yaml index fff605cc..368c33d2 100644 --- a/config/crd/kic/k8s.nginx.org_globalconfigurations.yaml +++ b/config/crd/kic/k8s.nginx.org_globalconfigurations.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: globalconfigurations.k8s.nginx.org spec: diff --git a/config/crd/kic/k8s.nginx.org_policies.yaml b/config/crd/kic/k8s.nginx.org_policies.yaml index 0c323de4..7208d88f 100644 --- a/config/crd/kic/k8s.nginx.org_policies.yaml +++ b/config/crd/kic/k8s.nginx.org_policies.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: policies.k8s.nginx.org spec: @@ -170,6 +170,102 @@ spec: storage: true subresources: status: {} + - name: v1alpha1 + schema: + openAPIV3Schema: + description: Policy defines a Policy for VirtualServer and VirtualServerRoute resources. + type: object + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: PolicySpec is the spec of the Policy resource. The spec includes multiple fields, where each field represents a different policy. Only one policy (field) is allowed. + type: object + properties: + accessControl: + description: AccessControl defines an access policy based on the source IP of a request. + type: object + properties: + allow: + type: array + items: + type: string + deny: + type: array + items: + type: string + egressMTLS: + description: EgressMTLS defines an Egress MTLS policy. + type: object + properties: + ciphers: + type: string + protocols: + type: string + serverName: + type: boolean + sessionReuse: + type: boolean + sslName: + type: string + tlsSecret: + type: string + trustedCertSecret: + type: string + verifyDepth: + type: integer + verifyServer: + type: boolean + ingressMTLS: + description: IngressMTLS defines an Ingress MTLS policy. + type: object + properties: + clientCertSecret: + type: string + verifyClient: + type: string + verifyDepth: + type: integer + jwt: + description: JWTAuth holds JWT authentication configuration. + type: object + properties: + realm: + type: string + secret: + type: string + token: + type: string + rateLimit: + description: RateLimit defines a rate limit policy. + type: object + properties: + burst: + type: integer + delay: + type: integer + dryRun: + type: boolean + key: + type: string + logLevel: + type: string + noDelay: + type: boolean + rate: + type: string + rejectCode: + type: integer + zoneSize: + type: string + served: true + storage: false status: acceptedNames: kind: "" diff --git a/config/crd/kic/k8s.nginx.org_transportservers.yaml b/config/crd/kic/k8s.nginx.org_transportservers.yaml index fd678e86..6c835178 100644 --- a/config/crd/kic/k8s.nginx.org_transportservers.yaml +++ b/config/crd/kic/k8s.nginx.org_transportservers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: transportservers.k8s.nginx.org spec: diff --git a/config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml b/config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml index 9a70ed8c..3c883655 100644 --- a/config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml +++ b/config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: virtualserverroutes.k8s.nginx.org spec: @@ -539,6 +539,8 @@ spec: type: string next-upstream-tries: type: integer + ntlm: + type: boolean port: type: integer queue: diff --git a/config/crd/kic/k8s.nginx.org_virtualservers.yaml b/config/crd/kic/k8s.nginx.org_virtualservers.yaml index 213b9d1f..950594b5 100644 --- a/config/crd/kic/k8s.nginx.org_virtualservers.yaml +++ b/config/crd/kic/k8s.nginx.org_virtualservers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.6.2 + controller-gen.kubebuilder.io/version: v0.7.0 creationTimestamp: null name: virtualservers.k8s.nginx.org spec: @@ -569,6 +569,8 @@ spec: type: string next-upstream-tries: type: integer + ntlm: + type: boolean port: type: integer queue: