Remove unused service annotations (#3362)

* Remove unused service annotations * Remove files for aws-nlb that rely on service annotations

apis/v1alpha2/nginxproxy_types.go

@@ -523,11 +523,6 @@ type ServiceSpec struct {
 // +optional
 LoadBalancerClass *string `json:"loadBalancerClass,omitempty"`
 
-// Annotations contain any Service-specific annotations.
-//
-// +optional
-Annotations map[string]string `json:"annotations,omitempty"`
-
 // LoadBalancerSourceRanges are the IP ranges (CIDR) that are allowed to access the load balancer.
 // Requires service type to be LoadBalancer.
 //

charts/nginx-gateway-fabric/README.md

@@ -258,7 +258,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
 | `certGenerator.overwrite` | Overwrite existing TLS Secrets on startup. | bool | `false` |
 | `certGenerator.serverTLSSecretName` | The name of the Secret containing TLS CA, certificate, and key for the NGINX Gateway Fabric control plane to securely communicate with the NGINX Agent. Must exist in the same namespace that the NGINX Gateway Fabric control plane is running in (default namespace: nginx-gateway). | string | `"server-tls"` |
 | `clusterDomain` | The DNS cluster domain of your Kubernetes cluster. | string | `"cluster.local"` |
-| `nginx` | The nginx section contains the configuration for all NGINX data plane deployments installed by the NGINX Gateway Fabric control plane. | object | `{"config":{},"container":{},"debug":false,"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric/nginx","tag":"edge"},"imagePullSecret":"","imagePullSecrets":[],"kind":"deployment","plus":false,"pod":{},"replicas":1,"service":{"annotations":{},"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"},"usage":{"caSecretName":"","clientSSLSecretName":"","endpoint":"","resolver":"","secretName":"nplus-license","skipVerify":false}}` |
+| `nginx` | The nginx section contains the configuration for all NGINX data plane deployments installed by the NGINX Gateway Fabric control plane. | object | `{"config":{},"container":{},"debug":false,"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric/nginx","tag":"edge"},"imagePullSecret":"","imagePullSecrets":[],"kind":"deployment","plus":false,"pod":{},"replicas":1,"service":{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"},"usage":{"caSecretName":"","clientSSLSecretName":"","endpoint":"","resolver":"","secretName":"nplus-license","skipVerify":false}}` |
 | `nginx.config` | The configuration for the data plane that is contained in the NginxProxy resource. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{}` |
 | `nginx.container` | The container configuration for the NGINX container. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{}` |
 | `nginx.debug` | Enable debugging for NGINX. Uses the nginx-debug binary. The NGINX error log level should be set to debug in the NginxProxy resource. | bool | `false` |
@@ -269,8 +269,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
 | `nginx.plus` | Is NGINX Plus image being used. | bool | `false` |
 | `nginx.pod` | The pod configuration for the NGINX data plane pod. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{}` |
 | `nginx.replicas` | The number of replicas of the NGINX Deployment. | int | `1` |
-| `nginx.service` | The service configuration for the NGINX data plane. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{"annotations":{},"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"}` |
-| `nginx.service.annotations` | The annotations of the NGINX data plane service. | object | `{}` |
+| `nginx.service` | The service configuration for the NGINX data plane. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"}` |
 | `nginx.service.externalTrafficPolicy` | The externalTrafficPolicy of the service. The value Local preserves the client source IP. | string | `"Local"` |
 | `nginx.service.loadBalancerClass` | LoadBalancerClass is the class of the load balancer implementation this Service belongs to. Requires nginx.service.type set to LoadBalancer. | string | `""` |
 | `nginx.service.loadBalancerIP` | The static IP address for the load balancer. Requires nginx.service.type set to LoadBalancer. | string | `""` |

charts/nginx-gateway-fabric/values.schema.json

@@ -356,12 +356,6 @@
  "service": {
  "description": "The service configuration for the NGINX data plane. This is applied globally to all Gateways managed by this\ninstance of NGINX Gateway Fabric.",
  "properties": {
- "annotations": {
- "description": "The annotations of the NGINX data plane service.",
- "required": [],
- "title": "annotations",
- "type": "object"
- },
  "externalTrafficPolicy": {
  "default": "Local",
  "description": "The externalTrafficPolicy of the service. The value Local preserves the client source IP.",

charts/nginx-gateway-fabric/values.yaml

@@ -425,9 +425,6 @@ nginx:
  # -- The externalTrafficPolicy of the service. The value Local preserves the client source IP.
  externalTrafficPolicy: Local
 
- # -- The annotations of the NGINX data plane service.
- annotations: {}
-
  # -- The static IP address for the load balancer. Requires nginx.service.type set to LoadBalancer.
  loadBalancerIP: ""
 

config/crd/bases/gateway.nginx.org_nginxproxies.yaml

@@ -3467,11 +3467,6 @@ spec:
  service:
  description: Service is the configuration for the NGINX Service.
  properties:
- annotations:
- additionalProperties:
- type: string
- description: Annotations contain any Service-specific annotations.
- type: object
  externalTrafficPolicy:
  default: Local
  description: |-