Skip to content

chore: Fix trivial crds yamllint issues #2979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+328 −322
Open

chore: Fix trivial crds yamllint issues #2979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions charts/postgres-operator/crds/operatorconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand All @@ -12,9 +13,9 @@ spec:
plural: operatorconfigurations
singular: operatorconfiguration
shortNames:
- opconfig
- opconfig
categories:
- all
- all
scope: Namespaced
versions:
- name: v1
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -596,8 +597,8 @@ spec:
items:
type: string
default:
- admin
- cron_admin
- admin
- cron_admin
role_deletion_suffix:
type: string
default: "_deleted"
Expand Down
159 changes: 80 additions & 79 deletions charts/postgres-operator/crds/postgresqls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand All @@ -12,9 +13,9 @@ spec:
plural: postgresqls
singular: postgresql
shortNames:
- pg
- pg
categories:
- all
- all
scope: Namespaced
versions:
- name: v1
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -239,8 +240,8 @@ spec:
items:
type: object
required:
- preference
- weight
- preference
- weight
properties:
preference:
type: object
Expand All @@ -250,8 +251,8 @@ spec:
items:
type: object
required:
- key
- operator
- key
- operator
properties:
key:
type: string
Expand All @@ -266,8 +267,8 @@ spec:
items:
type: object
required:
- key
- operator
- key
- operator
properties:
key:
type: string
Expand All @@ -283,7 +284,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
type: object
required:
- nodeSelectorTerms
- nodeSelectorTerms
properties:
nodeSelectorTerms:
type: array
Expand All @@ -295,8 +296,8 @@ spec:
items:
type: object
required:
- key
- operator
- key
- operator
properties:
key:
type: string
Expand All @@ -311,8 +312,8 @@ spec:
items:
type: object
required:
- key
- operator
- key
- operator
properties:
key:
type: string
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading