From 001c0cd7c670b4ec530fd5d82827c3815bc4a5be Mon Sep 17 00:00:00 2001 From: Zhouyang Zhang Date: Mon, 24 Oct 2022 10:44:41 +0800 Subject: [PATCH] auto gen code --- .../templates/crd-peeringacceptors.yaml | 2 +- .../consul/templates/crd-peeringdialers.yaml | 2 +- .../consul/templates/crd-servicedefaults.yaml | 20 ++++++++++--------- .../api/v1alpha1/zz_generated.deepcopy.go | 7 ++++++- .../consul.hashicorp.com_servicedefaults.yaml | 20 ++++++++++--------- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/charts/consul/templates/crd-peeringacceptors.yaml b/charts/consul/templates/crd-peeringacceptors.yaml index e06e830f04..b29b1cd790 100644 --- a/charts/consul/templates/crd-peeringacceptors.yaml +++ b/charts/consul/templates/crd-peeringacceptors.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.connectInject.enabled .Values.global.peering.enabled }} +{{- if .Values.controller.enabled }} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/charts/consul/templates/crd-peeringdialers.yaml b/charts/consul/templates/crd-peeringdialers.yaml index e24401e761..e876daa15e 100644 --- a/charts/consul/templates/crd-peeringdialers.yaml +++ b/charts/consul/templates/crd-peeringdialers.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.connectInject.enabled .Values.global.peering.enabled }} +{{- if .Values.controller.enabled }} --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition diff --git a/charts/consul/templates/crd-servicedefaults.yaml b/charts/consul/templates/crd-servicedefaults.yaml index b8b71e9ac2..1cf42673a8 100644 --- a/charts/consul/templates/crd-servicedefaults.yaml +++ b/charts/consul/templates/crd-servicedefaults.yaml @@ -113,20 +113,22 @@ spec: TLS SNI value to be changed to a non-connect value when federating with an external system. type: string + localConnectTimeoutMs: + description: The number of milliseconds allowed to make connections + to the local application instance before timing out. Defaults to + 5000. + type: integer + localRequestTimeoutMs: + description: In milliseconds, the timeout for HTTP requests to the + local application instance. Applies to HTTP-based protocols only. + If not specified, inherits the Envoy default for route timeouts + (15s). + type: integer maxInboundConnections: description: MaxInboundConnections is the maximum number of concurrent inbound connections to each service instance. Defaults to 0 (using consul's default) if not set. type: integer - localConnectTimeoutMs: - description: The number of milliseconds allowed to make connections to - the local application instance before timing out. Defaults to 5000. - type: integer - localRequestTimeoutMs: - description: In milliseconds, the timeout for HTTP requests to the local - application instance. Applies to HTTP-based protocols only. If not specified, - inherits the Envoy default for route timeouts (15s). - type: integer meshGateway: description: MeshGateway controls the default mesh gateway configuration for this service. diff --git a/control-plane/api/v1alpha1/zz_generated.deepcopy.go b/control-plane/api/v1alpha1/zz_generated.deepcopy.go index 63ef426790..8e96bdf0c2 100644 --- a/control-plane/api/v1alpha1/zz_generated.deepcopy.go +++ b/control-plane/api/v1alpha1/zz_generated.deepcopy.go @@ -807,6 +807,11 @@ func (in *MeshTLSConfig) DeepCopy() *MeshTLSConfig { func (in *PassiveHealthCheck) DeepCopyInto(out *PassiveHealthCheck) { *out = *in out.Interval = in.Interval + if in.EnforcingConsecutive5xx != nil { + in, out := &in.EnforcingConsecutive5xx, &out.EnforcingConsecutive5xx + *out = new(uint32) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PassiveHealthCheck. @@ -2190,7 +2195,7 @@ func (in *Upstream) DeepCopyInto(out *Upstream) { if in.PassiveHealthCheck != nil { in, out := &in.PassiveHealthCheck, &out.PassiveHealthCheck *out = new(PassiveHealthCheck) - **out = **in + (*in).DeepCopyInto(*out) } out.MeshGateway = in.MeshGateway } diff --git a/control-plane/config/crd/bases/consul.hashicorp.com_servicedefaults.yaml b/control-plane/config/crd/bases/consul.hashicorp.com_servicedefaults.yaml index 60a7a58e24..944f494f98 100644 --- a/control-plane/config/crd/bases/consul.hashicorp.com_servicedefaults.yaml +++ b/control-plane/config/crd/bases/consul.hashicorp.com_servicedefaults.yaml @@ -106,20 +106,22 @@ spec: TLS SNI value to be changed to a non-connect value when federating with an external system. type: string + localConnectTimeoutMs: + description: The number of milliseconds allowed to make connections + to the local application instance before timing out. Defaults to + 5000. + type: integer + localRequestTimeoutMs: + description: In milliseconds, the timeout for HTTP requests to the + local application instance. Applies to HTTP-based protocols only. + If not specified, inherits the Envoy default for route timeouts + (15s). + type: integer maxInboundConnections: description: MaxInboundConnections is the maximum number of concurrent inbound connections to each service instance. Defaults to 0 (using consul's default) if not set. type: integer - localConnectTimeoutMs: - description: The number of milliseconds allowed to make connections to - the local application instance before timing out. Defaults to 5000. - type: integer - localRequestTimeoutMs: - description: In milliseconds, the timeout for HTTP requests to the local - application instance. Applies to HTTP-based protocols only. If not specified, - inherits the Envoy default for route timeouts (15s). - type: integer meshGateway: description: MeshGateway controls the default mesh gateway configuration for this service.