From 9452b767895c4cafa14619fcd8248d2c5ca0b7b3 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Tue, 29 Jun 2021 15:10:54 -0400 Subject: [PATCH 1/2] chore(ci): `exit 1` when `make fmt` is dirty --- Makefile | 2 +- README.md | 15 +++++++++++---- scripts/fmt.sh | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 403052ce..23e0764e 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ fmt: README.md README.md: README.md.gotmpl values.yaml @echo "--- Generating documentation" helm-docs --template-files=$< - @echo "\n\n$$(cat README.md)" > README.md + @printf "\n\n%s\n" "$$(cat README.md)" > README.md .PHONY: README.md clean: diff --git a/README.md b/README.md index 74c2120d..b3279029 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ - - -# Coder Helm Chart +\n\n# Coder Helm Chart [![build](https://github.com/cdr/enterprise-helm/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/cdr/enterprise-helm/actions/workflows/build.yml) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq) @@ -88,7 +86,16 @@ View [our docs](https://coder.com/docs/setup/installation) for detailed installa | postgres.host | string | Host of the external PostgreSQL instance. | `""` | | postgres.passwordSecret | string | Name of an existing secret in the current namespace with the password of the PostgreSQL instance. The password must be contained in the secret field `password`. This should be set to an empty string if the database does not require a password to connect. | `""` | | postgres.port | string | Port of the external PostgreSQL instance. | `""` | -| postgres.sslMode | string | Provides variable levels of protection for the PostgreSQL connection. For acceptable values, see: https://www.postgresql.org/docs/9.1/libpq-ssl.html | `"require"` | +| postgres.ssl | object | Options for configuring the SSL cert, key, and root cert when connecting to Postgres. | `{"certSecret":{"key":"","name":""},"keySecret":{"key":"","name":""},"rootCertSecret":{"key":"","name":""}}` | +| postgres.ssl.certSecret | object | Secret containing a PEM encoded cert file. | `{"key":"","name":""}` | +| postgres.ssl.certSecret.key | string | Key pointing to a certificate in the secret. | `""` | +| postgres.ssl.certSecret.name | string | Name of the secret. | `""` | +| postgres.ssl.keySecret | object | Secret containing a PEM encoded key file. | `{"key":"","name":""}` | +| postgres.ssl.keySecret.key | string | Key pointing to a certificate in the secret. | `""` | +| postgres.ssl.rootCertSecret | object | Secret containing a PEM encoded root cert file. | `{"key":"","name":""}` | +| postgres.ssl.rootCertSecret.key | string | Key pointing to a certificate in the secret. | `""` | +| postgres.ssl.rootCertSecret.name | string | Name of the secret. | `""` | +| postgres.sslMode | string | Provides variable levels of protection for the PostgreSQL connection. For acceptable values, see: https://www.postgresql.org/docs/11/libpq-ssl.html | `"require"` | | postgres.user | string | User of the external PostgreSQL instance. | `""` | | services | object | Kubernetes Service configuration that applies to Coder services. | `{"annotations":{},"clusterDomainSuffix":".svc.cluster.local","nodeSelector":{"kubernetes.io/arch":"amd64","kubernetes.io/os":"linux"},"tolerations":[],"type":"ClusterIP"}` | | services.annotations | object | A KV mapping of annotations. See: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ | `{}` | diff --git a/scripts/fmt.sh b/scripts/fmt.sh index 2a364a1c..a550cb1f 100755 --- a/scripts/fmt.sh +++ b/scripts/fmt.sh @@ -35,5 +35,7 @@ pushd "$PROJECT_ROOT" >/dev/null do git --no-pager diff "$file" done + + exit 1 fi popd >/dev/null From 9ca1cafc3f6937abb50e906071a2c65db77490ed Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 8 Dec 2021 17:23:57 -0600 Subject: [PATCH 2/2] fixup! chore(ci): `exit 1` when `make fmt` is dirty --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b3279029..1c06e497 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -\n\n# Coder Helm Chart + + +# Coder Helm Chart [![build](https://github.com/cdr/enterprise-helm/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/cdr/enterprise-helm/actions/workflows/build.yml) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)