make manifests

monzo · Apr 5, 2024 · 20cd876 · 20cd876
1 parent 9c161a4
commit 20cd876
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/api/v1/externalservice_types.go b/api/v1/externalservice_types.go
@@ -64,17 +64,17 @@ type ExternalServiceSpec struct {
 	EnvoyClusterMaxConnections *uint32 `json:"envoyClusterMaxConnections,omitempty"`
 
 	// Input to the --log-level command line option. See the help text for the available log levels and the default.
-	EnvoyLogLevel string `json:"envoyArguments,omitempty"`
+	EnvoyLogLevel string `json:"envoyLogLevel,omitempty"`
 
 	// Corresponds to Envoy's dns_refresh_rate config field for this cluster, in seconds
 	// See	https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto
 	// +optional
-	EnvoyDnsRefreshRateS int64 `json:"envoy_dns_refresh_rate,omitempty"`
+	EnvoyDnsRefreshRateS int64 `json:"envoyDnsRefreshRateS,omitempty"`
 
 	// Corresponds to Envoy's respect_dns_ttl config field for this cluster.
 	// See	https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto
 	// +optional
-	EnvoyRespectDnsTTL bool `json:"envoy_respect_dns_ttl,omitempty"`
+	EnvoyRespectDnsTTL bool `json:"envoyRespectDnsTTL,omitempty"`
 
 	// Provides a way to override the global default
 	// +optional

diff --git a/config/crd/bases/egress.monzo.com_externalservices.yaml b/config/crd/bases/egress.monzo.com_externalservices.yaml
@@ -39,26 +39,26 @@ spec:
               dnsName:
                 description: DnsName is a DNS name target for the external service
                 type: string
-              envoyLogLevel:
-                description:  Input to the --log-level command line option. See the help text for the available log levels and the default.
-                type: string
-              envoyDnsRefreshRateS:
-                description: | 
-                  Corresponds to Envoy's dns_refresh_rate config field for this cluster, in seconds
-                  See	https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto
-                type: number
-              envoyRespectDnsTTL:
-                description: |
-                  Corresponds to Envoy's respect_dns_ttl config field for this cluster.
-                  See	https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto
-                type: boolean
               envoyClusterMaxConnections:
                 description: The maximum number of connections that Envoy will establish
                   to all hosts in an upstream cluster (defaults to 1024). If this
                   circuit breaker overflows the upstream_cx_overflow counter for the
                   cluster will increment.
                 format: int32
                 type: integer
+              envoyDnsRefreshRateS:
+                description: "Corresponds to Envoy's dns_refresh_rate config field
+                  for this cluster, in seconds See\thttps://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto"
+                format: int64
+                type: integer
+              envoyLogLevel:
+                description: Input to the --log-level command line option. See the
+                  help text for the available log levels and the default.
+                type: string
+              envoyRespectDnsTTL:
+                description: "Corresponds to Envoy's respect_dns_ttl config field
+                  for this cluster. See\thttps://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/cluster.proto"
+                type: boolean
               hijackDns:
                 description: 'If true, add a `egress.monzo.com/hijack-dns: true` label
                   to produced Service objects CoreDNS can watch this label and decide
@@ -144,6 +144,9 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              serviceTopologyMode:
+                description: Provides a way to override the global default
+                type: string
               targetCPUUtilizationPercentage:
                 description: Target average CPU utilization (represented as a percentage
                   of requested CPU) over all the pods. Defaults to 50