Skip to content
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

ci(trunk): fix trunk fmt #639

Closed
wants to merge 1 commit into from
Closed

ci(trunk): fix trunk fmt #639

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
2 changes: 1 addition & 1 deletion .trunk/trunk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ lint:
- markdownlint
paths:
- .trunk/**
- docs/docs/**
- docs/**

runtimes:
enabled:
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ generate: userconfigs boilerplate imports manifests docs charts fmt ## Run all c
.PHONY: fmt
fmt: ## Format code.
go fmt ./...
trunk fmt
byashimov marked this conversation as resolved.
Show resolved Hide resolved

.PHONY: vet
vet: ## Run go vet against code.
Expand Down
795 changes: 378 additions & 417 deletions charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml
View file
Open in desktop

Large diffs are not rendered by default.

761 changes: 361 additions & 400 deletions charts/aiven-operator-crds/templates/aiven.io_clickhouses.yaml
View file
Open in desktop

Large diffs are not rendered by default.

374 changes: 180 additions & 194 deletions charts/aiven-operator-crds/templates/aiven.io_clickhouseusers.yaml
View file
Open in desktop

Large diffs are not rendered by default.

417 changes: 201 additions & 216 deletions charts/aiven-operator-crds/templates/aiven.io_connectionpools.yaml
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 144 additions & 156 deletions charts/aiven-operator-crds/templates/aiven.io_databases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---

Check failure on line 1 in charts/aiven-operator-crds/templates/aiven.io_databases.yaml

View workflow job for this annotation

GitHub Actions / Trunk Check

prettier 

Incorrect formatting, autoformat by running 'trunk fmt'
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand All @@ -15,165 +15,153 @@
singular: database
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .spec.serviceName
name: Service Name
type: string
- jsonPath: .spec.project
name: Project
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Database is the Schema for the databases API
properties:
apiVersion:
description:
"APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
type: string
kind:
description:
"Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
type: string
metadata:
type: object
spec:
description: DatabaseSpec defines the desired state of Database
properties:
authSecretRef:
description: Authentication reference to Aiven token in a secret
- additionalPrinterColumns:
- jsonPath: .spec.serviceName
name: Service Name
type: string
- jsonPath: .spec.project
name: Project
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: Database is the Schema for the databases API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DatabaseSpec defines the desired state of Database
properties:
authSecretRef:
description: Authentication reference to Aiven token in a secret
properties:
key:
minLength: 1
type: string
name:
minLength: 1
type: string
required:
- key
- name
type: object
lcCollate:
description: 'Default string sort order (LC_COLLATE) of the database.
Default value: en_US.UTF-8'
maxLength: 128
type: string
lcCtype:
description: 'Default character classification (LC_CTYPE) of the database.
Default value: en_US.UTF-8'
maxLength: 128
type: string
project:
description: Project to link the database to
format: ^[a-zA-Z0-9_-]*$
maxLength: 63
type: string
serviceName:
description: PostgreSQL service to link the database to
maxLength: 63
type: string
terminationProtection:
description: It is a Kubernetes side deletion protections, which prevents
the database from being deleted by Kubernetes. It is recommended
to enable this for any production databases containing critical
data.
type: boolean
required:
- project
- serviceName
type: object
status:
description: DatabaseStatus defines the observed state of Database
properties:
conditions:
description: Conditions represent the latest available observations
of an Database state
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
key:
minLength: 1
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
name:
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- key
- name
- lastTransitionTime
- message
- reason
- status
- type
type: object
lcCollate:
description:
"Default string sort order (LC_COLLATE) of the database.
Default value: en_US.UTF-8"
maxLength: 128
type: string
lcCtype:
description:
"Default character classification (LC_CTYPE) of the database.
Default value: en_US.UTF-8"
maxLength: 128
type: string
project:
description: Project to link the database to
format: ^[a-zA-Z0-9_-]*$
maxLength: 63
type: string
serviceName:
description: PostgreSQL service to link the database to
maxLength: 63
type: string
terminationProtection:
description:
It is a Kubernetes side deletion protections, which prevents
the database from being deleted by Kubernetes. It is recommended
to enable this for any production databases containing critical
data.
type: boolean
required:
- project
- serviceName
type: object
status:
description: DatabaseStatus defines the observed state of Database
properties:
conditions:
description:
Conditions represent the latest available observations
of an Database state
items:
description:
"Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description:
lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description:
message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description:
observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description:
reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description:
type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
required:
- conditions
type: object
type: object
served: true
storage: true
subresources:
status: {}
type: array
required:
- conditions
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading
Loading