From e847e27321bea219e3050390d00d8c6d34c07e55 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Wed, 12 Nov 2025 15:49:36 +0100 Subject: [PATCH] chore: Fix trivial crds yamllint issues Signed-off-by: Mario Trangoni --- .../crds/operatorconfigurations.yaml | 59 +++---- .../postgres-operator/crds/postgresqls.yaml | 159 +++++++++--------- .../postgres-operator/crds/postgresteams.yaml | 107 ++++++------ manifests/operatorconfiguration.crd.yaml | 59 +++---- manifests/postgresql.crd.yaml | 159 +++++++++--------- manifests/postgresteam.crd.yaml | 107 ++++++------ 6 files changed, 328 insertions(+), 322 deletions(-) diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml index c6da405a5..2666045e3 100644 --- a/charts/postgres-operator/crds/operatorconfigurations.yaml +++ b/charts/postgres-operator/crds/operatorconfigurations.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -12,9 +13,9 @@ spec: plural: operatorconfigurations singular: operatorconfiguration shortNames: - - opconfig + - opconfig categories: - - all + - all scope: Namespaced versions: - name: v1 @@ -23,25 +24,25 @@ spec: subresources: status: {} additionalPrinterColumns: - - name: Image - type: string - description: Spilo image to be used for Pods - jsonPath: .configuration.docker_image - - name: Cluster-Label - type: string - description: Label for K8s resources created by operator - jsonPath: .configuration.kubernetes.cluster_name_label - - name: Service-Account - type: string - description: Name of service account to be used - jsonPath: .configuration.kubernetes.pod_service_account_name - - name: Min-Instances - type: integer - description: Minimum number of instances per Postgres cluster - jsonPath: .configuration.min_instances - - name: Age - type: date - jsonPath: .metadata.creationTimestamp + - name: Image + type: string + description: Spilo image to be used for Pods + jsonPath: .configuration.docker_image + - name: Cluster-Label + type: string + description: Label for K8s resources created by operator + jsonPath: .configuration.kubernetes.cluster_name_label + - name: Service-Account + type: string + description: Name of service account to be used + jsonPath: .configuration.kubernetes.pod_service_account_name + - name: Min-Instances + type: integer + description: Minimum number of instances per Postgres cluster + jsonPath: .configuration.min_instances + - name: Age + type: date + jsonPath: .metadata.creationTimestamp schema: openAPIV3Schema: type: object @@ -53,11 +54,11 @@ spec: kind: type: string enum: - - OperatorConfiguration + - OperatorConfiguration apiVersion: type: string enum: - - acid.zalan.do/v1 + - acid.zalan.do/v1 configuration: type: object properties: @@ -150,11 +151,11 @@ spec: type: integer default: 180 replication_username: - type: string - default: standby + type: string + default: standby super_username: - type: string - default: postgres + type: string + default: postgres major_version_upgrade: type: object properties: @@ -596,8 +597,8 @@ spec: items: type: string default: - - admin - - cron_admin + - admin + - cron_admin role_deletion_suffix: type: string default: "_deleted" diff --git a/charts/postgres-operator/crds/postgresqls.yaml b/charts/postgres-operator/crds/postgresqls.yaml index 8083e5e1d..f51a91e5e 100644 --- a/charts/postgres-operator/crds/postgresqls.yaml +++ b/charts/postgres-operator/crds/postgresqls.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -12,9 +13,9 @@ spec: plural: postgresqls singular: postgresql shortNames: - - pg + - pg categories: - - all + - all scope: Namespaced versions: - name: v1 @@ -23,37 +24,37 @@ spec: subresources: status: {} additionalPrinterColumns: - - name: Team - type: string - description: Team responsible for Postgres cluster - jsonPath: .spec.teamId - - name: Version - type: string - description: PostgreSQL version - jsonPath: .spec.postgresql.version - - name: Pods - type: integer - description: Number of Pods per Postgres cluster - jsonPath: .spec.numberOfInstances - - name: Volume - type: string - description: Size of the bound volume - jsonPath: .spec.volume.size - - name: CPU-Request - type: string - description: Requested CPU for Postgres containers - jsonPath: .spec.resources.requests.cpu - - name: Memory-Request - type: string - description: Requested memory for Postgres containers - jsonPath: .spec.resources.requests.memory - - name: Age - type: date - jsonPath: .metadata.creationTimestamp - - name: Status - type: string - description: Current sync status of postgresql resource - jsonPath: .status.PostgresClusterStatus + - name: Team + type: string + description: Team responsible for Postgres cluster + jsonPath: .spec.teamId + - name: Version + type: string + description: PostgreSQL version + jsonPath: .spec.postgresql.version + - name: Pods + type: integer + description: Number of Pods per Postgres cluster + jsonPath: .spec.numberOfInstances + - name: Volume + type: string + description: Size of the bound volume + jsonPath: .spec.volume.size + - name: CPU-Request + type: string + description: Requested CPU for Postgres containers + jsonPath: .spec.resources.requests.cpu + - name: Memory-Request + type: string + description: Requested memory for Postgres containers + jsonPath: .spec.resources.requests.memory + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + - name: Status + type: string + description: Current sync status of postgresql resource + jsonPath: .status.PostgresClusterStatus schema: openAPIV3Schema: type: object @@ -179,7 +180,7 @@ spec: type: object additionalProperties: type: string - # Note: usernames specified here as database owners must be declared in the users key of the spec key. + # Note: usernames specified here as database owners must be declared in the users key of the spec key. dockerImage: type: string enableConnectionPooler: @@ -239,8 +240,8 @@ spec: items: type: object required: - - preference - - weight + - preference + - weight properties: preference: type: object @@ -250,8 +251,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -266,8 +267,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -283,7 +284,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: type: object required: - - nodeSelectorTerms + - nodeSelectorTerms properties: nodeSelectorTerms: type: array @@ -295,8 +296,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -311,8 +312,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -495,12 +496,12 @@ spec: standby_port: type: string oneOf: - - required: - - s3_wal_path - - required: - - gs_wal_path - - required: - - standby_host + - required: + - s3_wal_path + - required: + - gs_wal_path + - required: + - standby_host streams: type: array items: @@ -595,34 +596,34 @@ spec: items: type: string enum: - - bypassrls - - BYPASSRLS - - nobypassrls - - NOBYPASSRLS - - createdb - - CREATEDB - - nocreatedb - - NOCREATEDB - - createrole - - CREATEROLE - - nocreaterole - - NOCREATEROLE - - inherit - - INHERIT - - noinherit - - NOINHERIT - - login - - LOGIN - - nologin - - NOLOGIN - - replication - - REPLICATION - - noreplication - - NOREPLICATION - - superuser - - SUPERUSER - - nosuperuser - - NOSUPERUSER + - bypassrls + - BYPASSRLS + - nobypassrls + - NOBYPASSRLS + - createdb + - CREATEDB + - nocreatedb + - NOCREATEDB + - createrole + - CREATEROLE + - nocreaterole + - NOCREATEROLE + - inherit + - INHERIT + - noinherit + - NOINHERIT + - login + - LOGIN + - nologin + - NOLOGIN + - replication + - REPLICATION + - noreplication + - NOREPLICATION + - superuser + - SUPERUSER + - nosuperuser + - NOSUPERUSER usersIgnoringSecretRotation: type: array nullable: true diff --git a/charts/postgres-operator/crds/postgresteams.yaml b/charts/postgres-operator/crds/postgresteams.yaml index b7a36848d..613b774a1 100644 --- a/charts/postgres-operator/crds/postgresteams.yaml +++ b/charts/postgres-operator/crds/postgresteams.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -12,59 +13,59 @@ spec: plural: postgresteams singular: postgresteam shortNames: - - pgteam + - pgteam categories: - - all + - all scope: Namespaced versions: - - name: v1 - served: true - storage: true - subresources: - status: {} - schema: - openAPIV3Schema: - type: object - required: - - kind - - apiVersion - - spec - properties: - kind: - type: string - enum: - - PostgresTeam - apiVersion: - type: string - enum: - - acid.zalan.do/v1 - spec: - type: object - properties: - additionalSuperuserTeams: - type: object - description: "Map for teamId and associated additional superuser teams" - additionalProperties: - type: array - nullable: true - description: "List of teams to become Postgres superusers" - items: - type: string - additionalTeams: - type: object - description: "Map for teamId and associated additional teams" - additionalProperties: - type: array - nullable: true - description: "List of teams whose members will also be added to the Postgres cluster" - items: - type: string - additionalMembers: - type: object - description: "Map for teamId and associated additional users" - additionalProperties: - type: array - nullable: true - description: "List of users who will also be added to the Postgres cluster" - items: - type: string + - name: v1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + required: + - kind + - apiVersion + - spec + properties: + kind: + type: string + enum: + - PostgresTeam + apiVersion: + type: string + enum: + - acid.zalan.do/v1 + spec: + type: object + properties: + additionalSuperuserTeams: + type: object + description: "Map for teamId and associated additional superuser teams" + additionalProperties: + type: array + nullable: true + description: "List of teams to become Postgres superusers" + items: + type: string + additionalTeams: + type: object + description: "Map for teamId and associated additional teams" + additionalProperties: + type: array + nullable: true + description: "List of teams whose members will also be added to the Postgres cluster" + items: + type: string + additionalMembers: + type: object + description: "Map for teamId and associated additional users" + additionalProperties: + type: array + nullable: true + description: "List of users who will also be added to the Postgres cluster" + items: + type: string diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index 6556b333c..d7587ff6e 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -10,9 +11,9 @@ spec: plural: operatorconfigurations singular: operatorconfiguration shortNames: - - opconfig + - opconfig categories: - - all + - all scope: Namespaced versions: - name: v1 @@ -21,25 +22,25 @@ spec: subresources: status: {} additionalPrinterColumns: - - name: Image - type: string - description: Spilo image to be used for Pods - jsonPath: .configuration.docker_image - - name: Cluster-Label - type: string - description: Label for K8s resources created by operator - jsonPath: .configuration.kubernetes.cluster_name_label - - name: Service-Account - type: string - description: Name of service account to be used - jsonPath: .configuration.kubernetes.pod_service_account_name - - name: Min-Instances - type: integer - description: Minimum number of instances per Postgres cluster - jsonPath: .configuration.min_instances - - name: Age - type: date - jsonPath: .metadata.creationTimestamp + - name: Image + type: string + description: Spilo image to be used for Pods + jsonPath: .configuration.docker_image + - name: Cluster-Label + type: string + description: Label for K8s resources created by operator + jsonPath: .configuration.kubernetes.cluster_name_label + - name: Service-Account + type: string + description: Name of service account to be used + jsonPath: .configuration.kubernetes.pod_service_account_name + - name: Min-Instances + type: integer + description: Minimum number of instances per Postgres cluster + jsonPath: .configuration.min_instances + - name: Age + type: date + jsonPath: .metadata.creationTimestamp schema: openAPIV3Schema: type: object @@ -51,11 +52,11 @@ spec: kind: type: string enum: - - OperatorConfiguration + - OperatorConfiguration apiVersion: type: string enum: - - acid.zalan.do/v1 + - acid.zalan.do/v1 configuration: type: object properties: @@ -148,11 +149,11 @@ spec: type: integer default: 180 replication_username: - type: string - default: standby + type: string + default: standby super_username: - type: string - default: postgres + type: string + default: postgres major_version_upgrade: type: object properties: @@ -594,8 +595,8 @@ spec: items: type: string default: - - admin - - cron_admin + - admin + - cron_admin role_deletion_suffix: type: string default: "_deleted" diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml index 39d751cef..e7d9518b2 100644 --- a/manifests/postgresql.crd.yaml +++ b/manifests/postgresql.crd.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -10,9 +11,9 @@ spec: plural: postgresqls singular: postgresql shortNames: - - pg + - pg categories: - - all + - all scope: Namespaced versions: - name: v1 @@ -21,37 +22,37 @@ spec: subresources: status: {} additionalPrinterColumns: - - name: Team - type: string - description: Team responsible for Postgres cluster - jsonPath: .spec.teamId - - name: Version - type: string - description: PostgreSQL version - jsonPath: .spec.postgresql.version - - name: Pods - type: integer - description: Number of Pods per Postgres cluster - jsonPath: .spec.numberOfInstances - - name: Volume - type: string - description: Size of the bound volume - jsonPath: .spec.volume.size - - name: CPU-Request - type: string - description: Requested CPU for Postgres containers - jsonPath: .spec.resources.requests.cpu - - name: Memory-Request - type: string - description: Requested memory for Postgres containers - jsonPath: .spec.resources.requests.memory - - name: Age - type: date - jsonPath: .metadata.creationTimestamp - - name: Status - type: string - description: Current sync status of postgresql resource - jsonPath: .status.PostgresClusterStatus + - name: Team + type: string + description: Team responsible for Postgres cluster + jsonPath: .spec.teamId + - name: Version + type: string + description: PostgreSQL version + jsonPath: .spec.postgresql.version + - name: Pods + type: integer + description: Number of Pods per Postgres cluster + jsonPath: .spec.numberOfInstances + - name: Volume + type: string + description: Size of the bound volume + jsonPath: .spec.volume.size + - name: CPU-Request + type: string + description: Requested CPU for Postgres containers + jsonPath: .spec.resources.requests.cpu + - name: Memory-Request + type: string + description: Requested memory for Postgres containers + jsonPath: .spec.resources.requests.memory + - name: Age + type: date + jsonPath: .metadata.creationTimestamp + - name: Status + type: string + description: Current sync status of postgresql resource + jsonPath: .status.PostgresClusterStatus schema: openAPIV3Schema: type: object @@ -177,7 +178,7 @@ spec: type: object additionalProperties: type: string - # Note: usernames specified here as database owners must be declared in the users key of the spec key. + # Note: usernames specified here as database owners must be declared in the users key of the spec key. dockerImage: type: string enableConnectionPooler: @@ -237,8 +238,8 @@ spec: items: type: object required: - - preference - - weight + - preference + - weight properties: preference: type: object @@ -248,8 +249,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -264,8 +265,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -281,7 +282,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: type: object required: - - nodeSelectorTerms + - nodeSelectorTerms properties: nodeSelectorTerms: type: array @@ -293,8 +294,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -309,8 +310,8 @@ spec: items: type: object required: - - key - - operator + - key + - operator properties: key: type: string @@ -493,12 +494,12 @@ spec: standby_port: type: string oneOf: - - required: - - s3_wal_path - - required: - - gs_wal_path - - required: - - standby_host + - required: + - s3_wal_path + - required: + - gs_wal_path + - required: + - standby_host streams: type: array items: @@ -593,34 +594,34 @@ spec: items: type: string enum: - - bypassrls - - BYPASSRLS - - nobypassrls - - NOBYPASSRLS - - createdb - - CREATEDB - - nocreatedb - - NOCREATEDB - - createrole - - CREATEROLE - - nocreaterole - - NOCREATEROLE - - inherit - - INHERIT - - noinherit - - NOINHERIT - - login - - LOGIN - - nologin - - NOLOGIN - - replication - - REPLICATION - - noreplication - - NOREPLICATION - - superuser - - SUPERUSER - - nosuperuser - - NOSUPERUSER + - bypassrls + - BYPASSRLS + - nobypassrls + - NOBYPASSRLS + - createdb + - CREATEDB + - nocreatedb + - NOCREATEDB + - createrole + - CREATEROLE + - nocreaterole + - NOCREATEROLE + - inherit + - INHERIT + - noinherit + - NOINHERIT + - login + - LOGIN + - nologin + - NOLOGIN + - replication + - REPLICATION + - noreplication + - NOREPLICATION + - superuser + - SUPERUSER + - nosuperuser + - NOSUPERUSER usersIgnoringSecretRotation: type: array nullable: true diff --git a/manifests/postgresteam.crd.yaml b/manifests/postgresteam.crd.yaml index 2588e53b1..e5aa255ec 100644 --- a/manifests/postgresteam.crd.yaml +++ b/manifests/postgresteam.crd.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -10,59 +11,59 @@ spec: plural: postgresteams singular: postgresteam shortNames: - - pgteam + - pgteam categories: - - all + - all scope: Namespaced versions: - - name: v1 - served: true - storage: true - subresources: - status: {} - schema: - openAPIV3Schema: - type: object - required: - - kind - - apiVersion - - spec - properties: - kind: - type: string - enum: - - PostgresTeam - apiVersion: - type: string - enum: - - acid.zalan.do/v1 - spec: - type: object - properties: - additionalSuperuserTeams: - type: object - description: "Map for teamId and associated additional superuser teams" - additionalProperties: - type: array - nullable: true - description: "List of teams to become Postgres superusers" - items: - type: string - additionalTeams: - type: object - description: "Map for teamId and associated additional teams" - additionalProperties: - type: array - nullable: true - description: "List of teams whose members will also be added to the Postgres cluster" - items: - type: string - additionalMembers: - type: object - description: "Map for teamId and associated additional users" - additionalProperties: - type: array - nullable: true - description: "List of users who will also be added to the Postgres cluster" - items: - type: string + - name: v1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + required: + - kind + - apiVersion + - spec + properties: + kind: + type: string + enum: + - PostgresTeam + apiVersion: + type: string + enum: + - acid.zalan.do/v1 + spec: + type: object + properties: + additionalSuperuserTeams: + type: object + description: "Map for teamId and associated additional superuser teams" + additionalProperties: + type: array + nullable: true + description: "List of teams to become Postgres superusers" + items: + type: string + additionalTeams: + type: object + description: "Map for teamId and associated additional teams" + additionalProperties: + type: array + nullable: true + description: "List of teams whose members will also be added to the Postgres cluster" + items: + type: string + additionalMembers: + type: object + description: "Map for teamId and associated additional users" + additionalProperties: + type: array + nullable: true + description: "List of users who will also be added to the Postgres cluster" + items: + type: string