From b59f98718945b27904b0c5cecd863ba57e563132 Mon Sep 17 00:00:00 2001 From: Nicolas Bigler Date: Fri, 20 Oct 2023 16:01:21 +0200 Subject: [PATCH] Add RBAC rules for minio metrics Signed-off-by: Nicolas Bigler --- .gitignore | 5 +++++ component/class/defaults.yml | 2 +- component/component/provider.jsonnet | 2 +- .../cloudscale/appcat/appcat/10_provider_kubernetes.yaml | 1 + .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- ..._v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../exoscale/appcat/appcat/10_provider_kubernetes.yaml | 1 + .../golden/minio/appcat/appcat/10_provider_kubernetes.yaml | 1 + .../minio/appcat/appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ..._v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../openshift/appcat/appcat/10_provider_kubernetes.yaml | 1 + ..._v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/vshn/appcat/appcat/10_provider_kubernetes.yaml | 1 + .../golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml | 4 ++-- .../vshn/appcat/appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/appcat/21_composition_vshn_postgresrestore.yaml | 2 +- .../golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml | 2 +- .../vshn/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ..._v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- component/tests/vshn.yml | 2 +- package/main.yaml | 2 +- 24 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 37688dc1b..a4870eef1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ sloth-output/ /component/compiled /package/.cache +/packages/compiled /package/dependencies /package/helmcharts /package/manifests @@ -32,4 +33,8 @@ sloth-output/ /package/crds /package/compiled +/compiled +/dependencies +/vendor + # Additional entries diff --git a/component/class/defaults.yml b/component/class/defaults.yml index c53492c2e..2b2d0c225 100644 --- a/component/class/defaults.yml +++ b/component/class/defaults.yml @@ -39,7 +39,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.34.0 + tag: v4.36.0 apiserver: registry: ghcr.io repository: vshn/appcat-apiserver diff --git a/component/component/provider.jsonnet b/component/component/provider.jsonnet index 2d6b2ef25..795144672 100644 --- a/component/component/provider.jsonnet +++ b/component/component/provider.jsonnet @@ -197,7 +197,7 @@ local controllerConfigRef(config) = }, { apiGroups: [ 'monitoring.coreos.com' ], - resources: [ 'prometheusrules', 'podmonitors', 'alertmanagerconfigs' ], + resources: [ 'prometheusrules', 'podmonitors', 'alertmanagerconfigs', 'servicemonitors' ], verbs: [ 'get', 'list', 'watch', 'update', 'patch', 'create', 'delete' ], }, { diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml index 5d62bf97a..970d2113b 100644 --- a/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/cloudscale/appcat/appcat/10_provider_kubernetes.yaml @@ -233,6 +233,7 @@ rules: - prometheusrules - podmonitors - alertmanagerconfigs + - servicemonitors verbs: - get - list diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml index b2e495054..8451d1d30 100644 --- a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 0a67b8bd2..a620b84fa 100644 --- a/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -28,7 +28,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNREDIS value: "false" - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml index a57512b00..b96e8f5ae 100644 --- a/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/exoscale/appcat/appcat/10_provider_kubernetes.yaml @@ -233,6 +233,7 @@ rules: - prometheusrules - podmonitors - alertmanagerconfigs + - servicemonitors verbs: - get - list diff --git a/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml index 5d62bf97a..970d2113b 100644 --- a/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/minio/appcat/appcat/10_provider_kubernetes.yaml @@ -233,6 +233,7 @@ rules: - prometheusrules - podmonitors - alertmanagerconfigs + - servicemonitors verbs: - get - list diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml index 90075b948..1370f252b 100644 --- a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml +++ b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml @@ -25,7 +25,7 @@ spec: data: controlNamespace: syn-appcat-control defaultPlan: standard-1 - imageTag: v4.34.0 + imageTag: v4.36.0 maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io minioChartVersion: 5.0.13 diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml index b2e495054..8451d1d30 100644 --- a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml index 6358d8b55..66e7668f1 100644 --- a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 name: sla-reporter resources: limits: diff --git a/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 0a67b8bd2..a620b84fa 100644 --- a/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/minio/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -28,7 +28,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNREDIS value: "false" - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml index cc6437fb2..6a6c4f82e 100644 --- a/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/openshift/appcat/appcat/10_provider_kubernetes.yaml @@ -235,6 +235,7 @@ rules: - prometheusrules - podmonitors - alertmanagerconfigs + - servicemonitors verbs: - get - list diff --git a/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 0a67b8bd2..a620b84fa 100644 --- a/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/openshift/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -28,7 +28,7 @@ spec: value: "false" - name: APPCAT_SLI_VSHNREDIS value: "false" - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml b/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml index 5d62bf97a..970d2113b 100644 --- a/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml +++ b/component/tests/golden/vshn/appcat/appcat/10_provider_kubernetes.yaml @@ -233,6 +233,7 @@ rules: - prometheusrules - podmonitors - alertmanagerconfigs + - servicemonitors verbs: - get - list diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml index 823c9051f..073682047 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_minio.yaml @@ -25,7 +25,7 @@ spec: data: controlNamespace: syn-appcat-control defaultPlan: standard-1 - imageTag: v4.34.0 + imageTag: v4.36.0 maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io minioChartVersion: 5.0.13 @@ -41,7 +41,7 @@ spec: image: minio imagePullPolicy: IfNotPresent runner: - endpoint: unix-abstract:crossplane/fn/default.sock + endpoint: 172.18.0.1:9547 timeout: 20s name: minio-func type: Container diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml index 855dd42ac..b78a0e3b5 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml @@ -33,7 +33,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: v4.34.0 + imageTag: v4.36.0 quotasEnabled: 'false' sgNamespace: stackgres sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "2Gi"}, diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml index abac4a808..97f80295f 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml @@ -33,7 +33,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: myuser@example.com externalDatabaseConnectionsEnabled: 'true' - imageTag: v4.34.0 + imageTag: v4.36.0 quotasEnabled: 'false' sgNamespace: stackgres sideCars: '{"clusterController": {"limits": {"cpu": "32m", "memory": "2Gi"}, diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml index fcb4bab1e..5f19cae48 100644 --- a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml +++ b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml @@ -30,7 +30,7 @@ spec: data: bucketRegion: lpg controlNamespace: syn-appcat-control - imageTag: v4.34.0 + imageTag: v4.36.0 maintenanceSA: helm-based-service-maintenance quotasEnabled: 'false' restoreSA: redisrestoreserviceaccount diff --git a/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml index b2e495054..8451d1d30 100644 --- a/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/component/tests/golden/vshn/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml index e47b4a6b6..3ab98b906 100644 --- a/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/component/tests/golden/vshn/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 name: sla-reporter resources: limits: diff --git a/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index d346447b3..d9f1df1a6 100644 --- a/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/component/tests/golden/vshn/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -28,7 +28,7 @@ spec: value: "true" - name: APPCAT_SLI_VSHNREDIS value: "true" - image: ghcr.io/vshn/appcat:v4.34.0 + image: ghcr.io/vshn/appcat:v4.36.0 livenessProbe: httpGet: path: /healthz diff --git a/component/tests/vshn.yml b/component/tests/vshn.yml index f9d670052..a3c217c13 100644 --- a/component/tests/vshn.yml +++ b/component/tests/vshn.yml @@ -106,7 +106,7 @@ parameters: note: "Will be scheduled on APPUiO Cloud plus nodes" minio: enabled: true - # grpcEndpoint: host.docker.internal:9547 + grpcEndpoint: 172.18.0.1:9547 generic: objectstorage: diff --git a/package/main.yaml b/package/main.yaml index a8195860b..259e21c0d 100644 --- a/package/main.yaml +++ b/package/main.yaml @@ -7,7 +7,7 @@ parameters: image: registry: ghcr.io repository: vshn/appcat - tag: v4.35.0 + tag: v4.36.0 components: appcat: url: https://github.com/vshn/component-appcat.git