Fix operatorconfigurations CRD: NamespacedName must render as type string (#3145)

mirror of https://github.com/zalando/postgres-operator.git synced 2026-09-30 15:54:17 +02:00

Upgrading to v2.0.0 fails at the CRD apply step. The apiserver rejects the
OperatorConfiguration CRD:

  CustomResourceDefinition "operatorconfigurations.acid.zalan.do" is invalid:
  ...oauth_token_secret_name.default: Invalid value: "string": in body must
  be of type object

Root cause: these CRDs are generated by controller-gen from the Go types.
spec.NamespacedName is a struct {Namespace, Name}, so controller-gen emits an
object schema for every NamespacedName field. But NamespacedName has custom
MarshalJSON/UnmarshalJSON that (de)serialize it as a plain JSON string
("namespace/name"). The generated object schema therefore never matched how
the operator actually reads and writes these fields (it did in 1.15.x, where
they were type: string).

For oauth_token_secret_name this is a hard failure: it also carries
`// +kubebuilder:default=postgres-operator`, and a scalar string default on an
object-typed property is rejected by the apiserver, blocking the whole
1.15.x -> 2.0.0 upgrade before the operator Deployment is touched.

Fix at the source by annotating the NamespacedName type with
`// +kubebuilder:validation:Type=string` and regenerating the CRDs. This makes
controller-gen emit `type: string` for all NamespacedName fields
(oauth_token_secret_name, infrastructure_roles_secret_name,
pod_environment_configmap, and the nested infrastructure role secretname),
matching their runtime serialization and restoring 1.15.x behaviour. A
field-level Type override cannot be used here: it conflicts with the
struct-derived schema ("object vs string in allOf") and fails generation.

Regenerated manifests/operatorconfiguration.crd.yaml and its two synced
copies (pkg/apis/... embed source and charts/.../crds). Verified with a
server-side dry-run apply: the unpatched CRD is rejected, the regenerated CRD
is accepted.

Fixes #3143

This commit is contained in:

IO ANALYTICA

2026-07-28 16:02:59 +02:00

committed by

GitHub

parent 8eda2cd1a2

commit 29168ca0bc

4 changed files with 17 additions and 126 deletions

									
										pkg/spec/types.go
									
		+5
		
												View File
												
				@@ -23,6 +23,11 @@ import (

				// consider using NamespacedNameOrDie() in testing.go in this package.

				//

				// from: https://github.com/kubernetes/apimachinery/blob/master/pkg/types/namespacedname.go

				//

				// NamespacedName marshals to and unmarshals from a plain JSON string

				// ("<namespace>/<name>") via its custom MarshalJSON/UnmarshalJSON, so its CRD

				// schema must be a string rather than the struct controller-gen would infer.

				// +kubebuilder:validation:Type=string

				type NamespacedName struct {

					Namespace string `json:"namespace,omitempty"`

					Name      string `json:"name"`