From f43e46ac3ba2ef1ae237e60deb4a24ec4a00c9ee Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 3 Feb 2023 12:51:12 +0100 Subject: [PATCH] Fix ci and valid config/auths --- .gitlab-ci.yml | 2 +- src/test/resources/nextcloud-test/valid-auth.yaml | 5 ++++- src/test/resources/nextcloud-test/valid-config.yaml | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6fc919..f099ef9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ test-schema: stage: build_and_test script: - lein uberjar - - java -jar target/uberjar/c4k-nextcloud-standalone.jar src/test/resources/nextcloud-test/valid-config.edn src/test/resources/nextcloud-test/valid-auth.edn | kubeconform --kubernetes-version 1.19.0 --strict --skip "Certificate,CronJob" - + - java -jar target/uberjar/c4k-nextcloud-standalone.jar src/test/resources/nextcloud-test/valid-config.yaml src/test/resources/nextcloud-test/valid-auth.yaml | kubeconform --kubernetes-version 1.19.0 --strict --skip "Certificate,CronJob" - artifacts: paths: - target/uberjar diff --git a/src/test/resources/nextcloud-test/valid-auth.yaml b/src/test/resources/nextcloud-test/valid-auth.yaml index 247409a..6d88bf3 100644 --- a/src/test/resources/nextcloud-test/valid-auth.yaml +++ b/src/test/resources/nextcloud-test/valid-auth.yaml @@ -4,4 +4,7 @@ nextcloud-admin-user: "cloudadmin" nextcloud-admin-password: "cloudpassword" aws-access-key-id: "aws-id" aws-secret-access-key: "aws-secret" -restic-password: "restic-password" \ No newline at end of file +restic-password: "restic-password" +mon-auth: + grafana-cloud-user: "user" + grafana-cloud-password: "password" \ No newline at end of file diff --git a/src/test/resources/nextcloud-test/valid-config.yaml b/src/test/resources/nextcloud-test/valid-config.yaml index c716cf2..48178b0 100644 --- a/src/test/resources/nextcloud-test/valid-config.yaml +++ b/src/test/resources/nextcloud-test/valid-config.yaml @@ -2,4 +2,8 @@ fqdn: "cloud.test.meissa-gmbh.de" issuer: "staging" nextcloud-data-volume-path: "/var/cloud" postgres-data-volume-path: "/var/postgres" -restic-repository: "s3:s3.amazonaws.com/your-bucket/your-folder" \ No newline at end of file +restic-repository: "s3:s3.amazonaws.com/your-bucket/your-folder" +mon-cfg: + grafana-cloud-url: "url-for-your-prom-remote-write-endpoint" + cluster-name: "keycloak" + cluster-stage: "test" \ No newline at end of file