From d8aee5aba887e3be7a56bbdd1fc62d9bbb3a5529 Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Tue, 3 Sep 2024 21:14:09 +0000 Subject: [PATCH] Fixup Signed-off-by: Keith Mattix II --- apis/v1/gateway_types.go | 4 ++++ .../gateway.networking.k8s.io_gateways.yaml | 14 ++++++++------ .../gateway.networking.k8s.io_gateways.yaml | 14 ++++++++------ geps/gep-1867/index.md | 3 --- pkg/generated/openapi/zz_generated.openapi.go | 2 +- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/apis/v1/gateway_types.go b/apis/v1/gateway_types.go index 45454a9061..d004d1e296 100644 --- a/apis/v1/gateway_types.go +++ b/apis/v1/gateway_types.go @@ -673,11 +673,15 @@ type GatewayStatus struct { type GatewayInfrastructure struct { // Labels that SHOULD be applied to any resources created in response to this Gateway. // + // For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. // For other implementations, this refers to any relevant (implementation specific) "labels" concepts. // // An implementation may chose to add additional implementation-specific labels as they see fit. // + // If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels + // change, it SHOULD clearly warn about this behavior in documentation. + // // Support: Extended // // +optional diff --git a/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml b/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml index 5c181d8196..bee981a918 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml @@ -189,9 +189,6 @@ spec: minLength: 0 type: string description: |- - Labels that SHOULD be applied to any resources created in response to this Gateway. - - For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) "labels" concepts. @@ -199,6 +196,10 @@ spec: An implementation may chose to add additional implementation-specific labels as they see fit. + If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels + change, it SHOULD clearly warn about this behavior in documentation. + + Support: Extended maxProperties: 8 type: object @@ -1414,9 +1415,6 @@ spec: minLength: 0 type: string description: |- - Labels that SHOULD be applied to any resources created in response to this Gateway. - - For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) "labels" concepts. @@ -1424,6 +1422,10 @@ spec: An implementation may chose to add additional implementation-specific labels as they see fit. + If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels + change, it SHOULD clearly warn about this behavior in documentation. + + Support: Extended maxProperties: 8 type: object diff --git a/config/crd/standard/gateway.networking.k8s.io_gateways.yaml b/config/crd/standard/gateway.networking.k8s.io_gateways.yaml index e1a41d9db8..a795090798 100644 --- a/config/crd/standard/gateway.networking.k8s.io_gateways.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_gateways.yaml @@ -189,9 +189,6 @@ spec: minLength: 0 type: string description: |- - Labels that SHOULD be applied to any resources created in response to this Gateway. - - For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) "labels" concepts. @@ -199,6 +196,10 @@ spec: An implementation may chose to add additional implementation-specific labels as they see fit. + If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels + change, it SHOULD clearly warn about this behavior in documentation. + + Support: Extended maxProperties: 8 type: object @@ -1316,9 +1317,6 @@ spec: minLength: 0 type: string description: |- - Labels that SHOULD be applied to any resources created in response to this Gateway. - - For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) "labels" concepts. @@ -1326,6 +1324,10 @@ spec: An implementation may chose to add additional implementation-specific labels as they see fit. + If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels + change, it SHOULD clearly warn about this behavior in documentation. + + Support: Extended maxProperties: 8 type: object diff --git a/geps/gep-1867/index.md b/geps/gep-1867/index.md index 999689a36f..a44134c79e 100644 --- a/geps/gep-1867/index.md +++ b/geps/gep-1867/index.md @@ -101,9 +101,6 @@ type GatewayInfrastructure struct { // // An implementation may chose to add additional implementation-specific labels as they see fit. // - // If an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels - // change, it SHOULD clearly warn about this behavior in documentation. - // // Support: Extended // // +optional diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 9dd96b6a9c..342209e9b6 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -3712,7 +3712,7 @@ func schema_sigsk8sio_gateway_api_apis_v1_GatewayInfrastructure(ref common.Refer Properties: map[string]spec.Schema{ "labels": { SchemaProps: spec.SchemaProps{ - Description: "Labels that SHOULD be applied to any resources created in response to this Gateway.\n\nFor implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) \"labels\" concepts.\n\nAn implementation may chose to add additional implementation-specific labels as they see fit.\n\nSupport: Extended", + Description: "For implementations creating other Kubernetes objects, this should be the `metadata.labels` field on resources. For other implementations, this refers to any relevant (implementation specific) \"labels\" concepts.\n\nAn implementation may chose to add additional implementation-specific labels as they see fit.\n\nIf an implementation maps these labels to Pods, or any other resource that would need to be recreated when labels change, it SHOULD clearly warn about this behavior in documentation.\n\nSupport: Extended", Type: []string{"object"}, AdditionalProperties: &spec.SchemaOrBool{ Allows: true,