From 635938da7e920d3d0106a1116d950c77fc945339 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Wed, 6 Dec 2023 13:58:06 +0100 Subject: [PATCH] ci: fix lint --- .woodpecker/e2e.yml | 2 +- .woodpecker/lint.yml | 2 +- README.md | 15 ++++++++---- tools/ct.yml | 2 ++ values.yaml | 54 ++++++++++++++++++++++++++------------------ 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/.woodpecker/e2e.yml b/.woodpecker/e2e.yml index 84a8019..c51294e 100644 --- a/.woodpecker/e2e.yml +++ b/.woodpecker/e2e.yml @@ -45,4 +45,4 @@ pipeline: - git fetch --no-tags --filter=blob:none origin - export KUBECONFIG=$${CI_WORKSPACE}/kube.config - kubectl get no -o wide - - ct install --config tools/ct.yml --chart-dirs ./ + - ct install --config tools/ct.yml --charts . diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml index 684837e..7cfbbb8 100644 --- a/.woodpecker/lint.yml +++ b/.woodpecker/lint.yml @@ -60,4 +60,4 @@ pipeline: pull: true commands: - git fetch --no-tags --filter=blob:none origin - - ct lint --config tools/ct.yml --chart-dirs ./ + - ct lint --config tools/ct.yml --charts . diff --git a/README.md b/README.md index dddb00f..80a4a9a 100644 --- a/README.md +++ b/README.md @@ -989,7 +989,10 @@ To comply with the Forgejo helm chart definition of the digest parameter, a "cus | `gitea.startupProbe.successThreshold` | Success threshold for startup probe | `1` | | `gitea.startupProbe.failureThreshold` | Failure threshold for startup probe | `10` | -### redis-cluster +### Redis® Cluster + +Redis® Cluster is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/redis-cluster) if enabled in the values. +Complete Configuration can be taken from their website. | Name | Description | Value | | -------------------------------- | -------------------------------------------- | ------- | @@ -998,11 +1001,14 @@ To comply with the Forgejo helm chart definition of the digest parameter, a "cus | `redis-cluster.cluster.nodes` | Number of redis cluster master nodes | `3` | | `redis-cluster.cluster.replicas` | Number of redis cluster master node replicas | `0` | -### PostgreSQL-ha +### PostgreSQL HA + +PostgreSQL HA is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha) if enabled in the values. +Complete Configuration can be taken from their website. | Name | Description | Value | | ------------------------------------------- | ---------------------------------------------------------------- | ----------- | -| `postgresql-ha.enabled` | Enable PostgreSQL-ha | `true` | +| `postgresql-ha.enabled` | Enable PostgreSQL HA chart | `true` | | `postgresql-ha.postgresql.password` | Password for the `gitea` user (overrides `auth.password`) | `changeme4` | | `postgresql-ha.global.postgresql.database` | Name for a custom database to create (overrides `auth.database`) | `gitea` | | `postgresql-ha.global.postgresql.username` | Name for a custom user to create (overrides `auth.username`) | `gitea` | @@ -1015,7 +1021,8 @@ To comply with the Forgejo helm chart definition of the digest parameter, a "cus ### PostgreSQL -PostgreSQL is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) if enabled in the values. Complete Configuration can be taken from their website. +PostgreSQL is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) if enabled in the values. +Complete Configuration can be taken from their website. | Name | Description | Value | | ------------------------------------------------------- | ---------------------------------------------------------------- | ------- | diff --git a/tools/ct.yml b/tools/ct.yml index 91cde47..bb9090a 100644 --- a/tools/ct.yml +++ b/tools/ct.yml @@ -2,3 +2,5 @@ check-version-increment: false debug: true target-branch: main +lint-conf: .yamllint +validate-maintainers: false # does not work with gitea \ No newline at end of file diff --git a/values.yaml b/values.yaml index c730361..eac552e 100644 --- a/values.yaml +++ b/values.yaml @@ -8,13 +8,13 @@ ## @param global.storageClass global storage class override ## @param global.hostAliases global hostAliases which will be added to the pod's hosts files global: - imageRegistry: "" + imageRegistry: '' ## E.g. ## imagePullSecrets: ## - myRegistryKeySecretName ## imagePullSecrets: [] - storageClass: "" + storageClass: '' hostAliases: [] # - ip: 192.168.137.2 # hostnames: @@ -28,9 +28,9 @@ replicaCount: 1 ## @param strategy.rollingUpdate.maxSurge maxSurge ## @param strategy.rollingUpdate.maxUnavailable maxUnavailable strategy: - type: "RollingUpdate" + type: 'RollingUpdate' rollingUpdate: - maxSurge: "100%" + maxSurge: '100%' maxUnavailable: 0 ## @param clusterDomain cluster domain @@ -48,11 +48,11 @@ image: registry: codeberg.org repository: forgejo/forgejo # Overrides the image tag whose default is the chart appVersion. - tag: "" - digest: "" + tag: '' + digest: '' pullPolicy: IfNotPresent rootless: true - fullOverride: "" + fullOverride: '' ## @param imagePullSecrets Secret to use for pulling the image imagePullSecrets: [] @@ -194,7 +194,7 @@ resources: ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## ## @param schedulerName Use an alternate scheduler, e.g. "stork" -schedulerName: "" +schedulerName: '' ## @param nodeSelector NodeSelector for the deployment nodeSelector: {} @@ -212,7 +212,7 @@ topologySpreadConstraints: [] dnsConfig: {} ## @param priorityClassName priorityClassName for the deployment -priorityClassName: "" +priorityClassName: '' ## @param deployment.env Additional environment variables to pass to containers ## @param deployment.terminationGracePeriodSeconds How long to wait until forcefully kill the pod @@ -237,7 +237,7 @@ deployment: ## @param serviceAccount.labels Custom labels for the ServiceAccount serviceAccount: create: false - name: "" + name: '' automountServiceAccountToken: false imagePullSecrets: [] # - name: private-registry-access @@ -268,7 +268,7 @@ persistence: labels: {} storageClass: subPath: - volumeName: "" + volumeName: '' annotations: helm.sh/resource-policy: keep @@ -296,7 +296,7 @@ extraVolumeMounts: [] ## @section Init ## @param initPreScript Bash shell script copied verbatim to the start of the init-container. -initPreScript: "" +initPreScript: '' # # initPreScript: | # mkdir -p /data/git/.postgresql @@ -324,12 +324,12 @@ initContainers: signing: enabled: false gpgHome: /data/git/.gnupg - privateKey: "" + privateKey: '' # privateKey: |- # -----BEGIN PGP PRIVATE KEY BLOCK----- # ... # -----END PGP PRIVATE KEY BLOCK----- - existingSecret: "" + existingSecret: '' ## @section Gitea # @@ -343,7 +343,7 @@ gitea: existingSecret: username: gitea_admin password: r8sA8CPHD9!bt6d - email: "gitea@local.domain" + email: 'gitea@local.domain' ## @param gitea.metrics.enabled Enable Forgejo metrics ## @param gitea.metrics.serviceMonitor.enabled Enable Forgejo metrics service monitor @@ -414,7 +414,7 @@ gitea: ## @param gitea.ssh.logLevel Configure OpenSSH's log level. Only available for root-based Forgejo image. ssh: - logLevel: "INFO" + logLevel: 'INFO' ## @section LivenessProbe # @@ -476,7 +476,12 @@ gitea: successThreshold: 1 failureThreshold: 10 -## @section redis-cluster +## @section Redis® Cluster +## @descriptionStart +## Redis® Cluster is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/redis-cluster) if enabled in the values. +## Complete Configuration can be taken from their website. +## @descriptionEnd +# ## @param redis-cluster.enabled Enable redis ## @param redis-cluster.usePassword Whether to use password authentication ## @param redis-cluster.cluster.nodes Number of redis cluster master nodes @@ -488,9 +493,13 @@ redis-cluster: nodes: 3 # default: 6 replicas: 0 # default: 1 -## @section postgresql-ha +## @section PostgreSQL HA +## @descriptionStart +## PostgreSQL HA is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha) if enabled in the values. +## Complete Configuration can be taken from their website. +## @descriptionEnd # -## @param postgresql-ha.enabled Enable postgresql-ha +## @param postgresql-ha.enabled Enable PostgreSQL HA chart ## @param postgresql-ha.postgresql.password Password for the `gitea` user (overrides `auth.password`) ## @param postgresql-ha.global.postgresql.database Name for a custom database to create (overrides `auth.database`) ## @param postgresql-ha.global.postgresql.username Name for a custom user to create (overrides `auth.username`) @@ -498,8 +507,8 @@ redis-cluster: ## @param postgresql-ha.postgresql.repmgrPassword Repmgr Password ## @param postgresql-ha.postgresql.postgresPassword postgres Password ## @param postgresql-ha.pgpool.adminPassword pgpool adminPassword -## @param postgresql-ha.service.ports.postgresql postgresql service port (overrides `service.ports.postgresql`) -## @param postgresql-ha.primary.persistence.size PVC Storage Request for postgresql-ha volume +## @param postgresql-ha.service.ports.postgresql PostgreSQL service port (overrides `service.ports.postgresql`) +## @param postgresql-ha.primary.persistence.size PVC Storage Request for PostgreSQL-ha volume postgresql-ha: global: postgresql: @@ -522,7 +531,8 @@ postgresql-ha: ## @section PostgreSQL ## @descriptionStart -## PostgreSQL is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) if enabled in the values. Complete Configuration can be taken from their website. +## PostgreSQL is loaded as a dependency from [Bitnami](https://github.com/bitnami/charts/tree/master/bitnami/postgresql) if enabled in the values. +## Complete Configuration can be taken from their website. ## @descriptionEnd # ## @param postgresql.enabled Enable PostgreSQL