From 6c061b58436cc7b89e4edbc8aab4ff45406700e5 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Thu, 1 Feb 2024 19:07:37 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20add=20missing=20info,=20reorder?= =?UTF-8?q?=20key,...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Bernard --- Cargo.toml | 1 - Dockerfile | 2 ++ cdviz-collector/Cargo.toml | 3 ++- charts/cdviz/values.yaml | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4705eda..31f9f6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,6 @@ [workspace] resolver = "2" members = [ - "cdevents-sdk-rust", "cdviz-collector", "cdviz-sensors", # "examples/*", diff --git a/Dockerfile b/Dockerfile index 1879b2c..b97100c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ HEALTHCHECK NONE # trivy:ignore:AVD-DS-0001 FROM cgr.dev/chainguard/glibc-dynamic as cdviz-collector LABEL org.opencontainers.image.source="https://github.com/davidB/cdviz" +LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later" ARG PROFILE=release USER nonroot COPY --from=build /work/target/${PROFILE}/cdviz-collector /usr/local/bin/cdviz-collector @@ -41,6 +42,7 @@ HEALTHCHECK NONE # trivy:ignore:AVD-DS-0001 FROM cgr.dev/chainguard/glibc-dynamic AS cdviz-dbmigration LABEL org.opencontainers.image.source="https://github.com/davidB/cdviz" +LABEL org.opencontainers.image.licenses="MIT OR Apache-2.0" USER nonroot COPY --from=build-sqlx /home/nonroot/.cargo/bin/sqlx /usr/local/bin/sqlx COPY migrations /migrations diff --git a/cdviz-collector/Cargo.toml b/cdviz-collector/Cargo.toml index 5d10d51..73f1224 100644 --- a/cdviz-collector/Cargo.toml +++ b/cdviz-collector/Cargo.toml @@ -7,8 +7,9 @@ categories = [] edition.workspace = true version.workspace = true authors.workspace = true -repository.workspace = true license.workspace = true +repository.workspace = true +rust-version.workspace = true publish.workspace = true [dependencies] diff --git a/charts/cdviz/values.yaml b/charts/cdviz/values.yaml index 32eaa04..e90b9b0 100644 --- a/charts/cdviz/values.yaml +++ b/charts/cdviz/values.yaml @@ -19,9 +19,10 @@ secrets: # cdviz requires a postgresql database to store its data. # The following sections is used to configure a database as part of the chart, # it's mainly to be used in the development, or demo environment (purpose). -# For production, you should use: -# - an external database (managed by your cloud provider). +# For production, you should prefer: +# - an external database (e.g. managed by your cloud provider). # - a k8s operated database like (non exhaustive list): +# - [CloudNativePG - PostgreSQL Operator for Kubernetes](https://cloudnative-pg.io/) # - [Postgres Operator (from Zalando)](https://postgres-operator.readthedocs.io/en/latest/) # - [KubeBlocks for PostgreSQL | KubeBlocks](https://kubeblocks.io/docs/release-0.7/user_docs/kubeblocks-for-postgresql) # - [Crunchy PostgreSQL For Kubernetes | Crunchy Data](https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes)