Code review round 2

Author: sjberman

docs/proposals/gateway-settings.md

@@ -67,35 +67,32 @@ type GatewaySettings struct {
 
 	// Spec defines the desired state of the GatewaySettings.
 	Spec GatewaySettingsSpec `json:"spec"`
-
-	// Status defines the state of the GatewaySettings.
-	Status GatewaySettingsStatus `json:"status,omitempty"`
 }
 
 type GatewaySettingsSpec struct {
-	// OtelExporter specifies OpenTelemetry export parameters.
+	// Telemetry specifies the OpenTelemetry configuration.
 	// +optional
-	OtelExporter *OtelExporter `json:"otelExporter,omitempty"`
+	Telemetry *Telemetry `json:"telemetry,omitempty"`
+}
 
-	// OtelServiceName is the "service.name" attribute of the Otel resourc.
-	// Default is 'nginx-gateway-fabric:<gateway-name>'.
+// Telemetry specifies the OpenTelemetry configuration.
+type Telemetry struct {
+	// Exporter specifies OpenTelemetry export parameters.
 	// +optional
-	OtelServiceName *string `json:"otelServiceName,omitempty"`
+	Exporter *Exporter `json:"exporter,omitempty"`
 
-	// OtelSpanAttributes are custom key/value attributes that are added to each span.
-	// Variables can be included in the values.
+	// ServiceName is the "service.name" attribute of the OpenTelemetry resource.
+	// Default is 'nginx-gateway-fabric:<gateway-name>'.
 	// +optional
-	OtelSpanAttributes map[string]string `json:"otelSpanAttributes,omitempty"`
-}
+	ServiceName *string `json:"serviceName,omitempty"`
 
-type GatewaySettingsStatus struct {
-	// Conditions describe the current conditions of the GatewaySettings.
+	// SpanAttributes are custom key/value attributes that are added to each span.
 	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	SpanAttributes map[string]string `json:"spanAttributes,omitempty"`
 }
 
-// OtelExporter specifies OpenTelemetry export parameters.
-type OtelExporter struct {
+// Exporter specifies OpenTelemetry export parameters.
+type Exporter struct {
 	// Interval is the maximum interval between two exports, by default is 5 seconds.
 	// +optional
 	Interval *Duration `json:"interval,omitempty"`
@@ -121,13 +118,11 @@ type Duration string
 
 ### Status
 
-#### Conditions
-
-The `Accepted` Condition must be populated on the `GatewaySettings` CRD using the reasons defined in the [PolicyCondition API](https://github.com/kubernetes-sigs/gateway-api/blob/main/apis/v1alpha2/policy_types.go). If these reasons are not sufficient, we can add implementation-specific reasons.
+#### GatewayClass
 
-#### GatewayClass Status
+> Note: This is subject to change, will not merge until ironed out.
 
-While this status does not officially exist, in order to be consistent with other resources with object refs we should add a custom `ResolvedRefs` Condition to the `GatewayClass` when the `parametersRef` is in use.
+In order to be consistent with other resources with object refs, we should add the `ResolvedRefs` Condition to the `GatewayClass` when the `parametersRef` is in use. If the `GatewaySettings` config is invalid, then the condition is set to `False` with a reason why.
 
 NGINX Gateway Fabric must set this Condition on the GatewayClass affected by a `GatewaySettings`.
 Below is an example of what this Condition may look like: