auto gen code

hashicorp · Oct 24, 2022 · 40add58 · 40add58
1 parent 1c1495a
commit 40add58
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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.