Format all files with prettier VSCode plugin and add yamllint in CI #413

Merged
pat-s merged 10 commits from format-files into main 2023-03-28 21:18:23 +00:00
8 changed files with 134 additions and 104 deletions

View File

@ -8,51 +8,56 @@ platform:
arch: arm64
steps:
- name: helm lint
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- helm lint
- name: helm lint
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- helm lint
- name: helm template
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- helm dependency update
- helm template --debug gitea-helm .
- name: helm template
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- helm dependency update
- helm template --debug gitea-helm .
- name: helm unittests
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing make helm git bash
- helm plugin install https://github.com/helm-unittest/helm-unittest
- helm dependency update
- make unittests
- name: helm unittests
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing make helm git bash
- helm plugin install https://github.com/helm-unittest/helm-unittest
- helm dependency update
- make unittests
- name: verify readme
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing make npm git
- make readme
- git diff --exit-code --name-only README.md
- name: verify readme
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing make npm git
- make readme
- git diff --exit-code --name-only README.md
- name: discord
pull: always
image: appleboy/drone-discord:1.2.4
environment:
DISCORD_WEBHOOK_ID:
from_secret: discord_webhook_id
DISCORD_WEBHOOK_TOKEN:
from_secret: discord_webhook_token
when:
status:
- changed
- failure
- name: yaml lint
pull: always
image: cytopia/yamllint:alpine-1
commands:
- yamllint -f colored .
- name: discord
pull: always
image: appleboy/drone-discord:1.2.4
environment:
DISCORD_WEBHOOK_ID:
from_secret: discord_webhook_id
DISCORD_WEBHOOK_TOKEN:
from_secret: discord_webhook_token
when:
status:
- changed
- failure
---
kind: pipeline
@ -65,40 +70,40 @@ platform:
trigger:
event:
- tag
- tag
steps:
- name: generate-chart
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- apk add --no-cache curl
- helm dependency update
- helm package --version "${DRONE_TAG##v}" ./
- mkdir gitea
- mv gitea*.tgz gitea/
- curl -L -o gitea/index.yaml https://dl.gitea.io/charts/index.yaml
- helm repo index gitea/ --url https://dl.gitea.io/charts --merge gitea/index.yaml
- name: generate-chart
pull: always
image: alpine:3.17
commands:
- apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing helm
- apk add --no-cache curl
- helm dependency update
- helm package --version "${DRONE_TAG##v}" ./
- mkdir gitea
- mv gitea*.tgz gitea/
- curl -L -o gitea/index.yaml https://dl.gitea.io/charts/index.yaml
- helm repo index gitea/ --url https://dl.gitea.io/charts --merge gitea/index.yaml
- name: upload-chart
pull: always
image: plugins/s3:latest
settings:
acl:
from_secret: aws_s3_acl
region:
from_secret: aws_s3_region
bucket:
from_secret: aws_s3_bucket
endpoint:
from_secret: aws_s3_endpoint
path_style:
from_secret: aws_s3_path_style
access_key:
from_secret: aws_access_key_id
secret_key:
from_secret: aws_secret_access_key
source: gitea/*
target: /charts
strip_prefix: gitea/
- name: upload-chart
pull: always
image: plugins/s3:latest
settings:
acl:
from_secret: aws_s3_acl
region:
from_secret: aws_s3_region
bucket:
from_secret: aws_s3_bucket
endpoint:
from_secret: aws_s3_endpoint
path_style:
from_secret: aws_s3_path_style
access_key:
from_secret: aws_access_key_id
secret_key:
from_secret: aws_secret_access_key
source: gitea/*
target: /charts
strip_prefix: gitea/

View File

@ -129,12 +129,12 @@ MD041:
MD044:
# List of proper names
names:
- Gitea
- PostgreSQL
- Memcached
- Prometheus
- Git
- GitOps
- Gitea
- PostgreSQL
- Memcached
- Prometheus
- Git
- GitOps
# Include code blocks
code_blocks: false

20
.yamllint Normal file
View File

@ -0,0 +1,20 @@
---
extends: default
ignore: |
.yamllint
node_modules
templates
rules:
truthy:
allowed-values: ['true', 'false']
check-keys: False
level: error
line-length: disable
document-start: disable
comments:
min-spaces-from-content: 1
braces:
max-spaces-inside: 2

View File

@ -1,9 +1,9 @@
dependencies:
- name: memcached
repository: oci://registry-1.docker.io/bitnamicharts
version: 6.3.13
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.2.6
- name: memcached
Review

If possible, we should probably disable formatting autogenerated files like Chart.lock. A helm dependency update with actually updated dependency version will remove the indentation again.

If possible, we should probably disable formatting autogenerated files like _Chart.lock_. A `helm dependency update` with actually updated dependency version will remove the indentation again.
Review

I think it's fine: the formatting is only targeting the indentation (which is off imo and according to the formatter).
The indentation is not changed when running helm dependency update.

So I think once we get the PR in, there shouldn't be any conflicts in this regard.

I think it's fine: the formatting is only targeting the indentation (which is off imo and according to the formatter). The indentation is not changed when running `helm dependency update`. So I think once we get the PR in, there shouldn't be any conflicts in this regard.
repository: oci://registry-1.docker.io/bitnamicharts
version: 6.3.13
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.2.6
digest: sha256:7a37054b0ae841314b1e309fec6f1edc0f22f77161ee915ebfb1ce011457884c
generated: "2023-03-28T21:20:51.230043+02:00"

View File

@ -33,13 +33,13 @@ maintainers:
# Bitnami charts are served from GitHub CDN - See https://github.com/bitnami/charts/issues/10539 for details
dependencies:
# OCI registry: https://blog.bitnami.com/2023/01/bitnami-helm-charts-available-as-oci.html (2023-01)
# Chart release date: 2023-03
- name: memcached
repository: oci://registry-1.docker.io/bitnamicharts
version: 6.3.13
condition: memcached.enabled
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.2.6
condition: postgresql.enabled
# OCI registry: https://blog.bitnami.com/2023/01/bitnami-helm-charts-available-as-oci.html (2023-01)
# Chart release date: 2023-03
- name: memcached
repository: oci://registry-1.docker.io/bitnamicharts
version: 6.3.13
condition: memcached.enabled
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.2.6
condition: postgresql.enabled

View File

@ -10,6 +10,6 @@ tests:
- hasDocuments:
count: 1
- containsDocument:
kind: Secret
kind: Secret
apiVersion: v1
name: gitea-unittests-init

View File

@ -12,6 +12,6 @@ tests:
- hasDocuments:
count: 1
- containsDocument:
kind: StatefulSet
kind: StatefulSet
apiVersion: apps/v1
name: gitea-unittests

View File

@ -138,7 +138,8 @@ ingress:
enabled: false
# className: nginx
className:
annotations: {}
annotations:
{}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
@ -157,7 +158,8 @@ ingress:
## @section StatefulSet
#
## @param resources Kubernetes resources
resources: {}
resources:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@ -192,7 +194,8 @@ dnsConfig: {}
## @param statefulset.labels Labels for the statefulset
## @param statefulset.annotations Annotations for the Gitea StatefulSet to be created
statefulset:
env: []
env:
[]
# - name: VARIABLE
# value: my-value
terminationGracePeriodSeconds: 60
@ -277,7 +280,7 @@ gitea:
## @param gitea.admin.password Password for the Gitea admin user
## @param gitea.admin.email Email for the Gitea admin user
admin:
#existingSecret: gitea-admin-secret
# existingSecret: gitea-admin-secret
existingSecret:
username: gitea_admin
password: r8sA8CPHD9!bt6d
@ -293,7 +296,8 @@ gitea:
# prometheus-release: prom1
## @param gitea.ldap LDAP configuration
ldap: []
ldap:
[]
# - name: "LDAP 1"
# existingSecret:
# securityProtocol:
@ -310,7 +314,8 @@ gitea:
# Either specify inline `key` and `secret` or refer to them via `existingSecret`
## @param gitea.oauth OAuth configuration
oauth: []
oauth:
[]
# - name: 'OAuth 1'
# provider:
# key: