From f3df3a7556ead47e7325a1b30ca2af54301cb49b Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 2 Feb 2024 23:37:45 +0100 Subject: [PATCH] upd --- packages/core/installer/images/installer.json | 6 +++--- packages/extra/monitoring/templates/vm/vmalert-scrape.yaml | 2 +- .../extra/monitoring/templates/vm/vmcluster-scrape.yaml | 2 +- packages/system/grafana-oncall/Chart.yaml | 4 ++-- packages/system/ingress-nginx/Chart.yaml | 6 +----- packages/system/kamaji-etcd/Chart.yaml | 6 +----- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index 9d5d0a87..40cea3bf 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:46a40d3c00ea1a0c3b30004d38b1b0b4c1b6e3e8ba40301d392af38f66ad5b23", + "containerimage.config.digest": "sha256:1e74c5d6b48380c70b04b99ab91ef5a6ef6fde818298edacd9e3487f568d7cc2", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:52fb7ab8b18ebaba6c117e0952d3f975dd3ff6ef585dad867e17a11a16731047", + "digest": "sha256:2a0c1e4c8cf19a74b08fb9de2f0cdc551f3bf54fd842e648f003f96784cb4d73", "size": 2074, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:52fb7ab8b18ebaba6c117e0952d3f975dd3ff6ef585dad867e17a11a16731047", + "containerimage.digest": "sha256:2a0c1e4c8cf19a74b08fb9de2f0cdc551f3bf54fd842e648f003f96784cb4d73", "image.name": "ghcr.io/aenix-io/cozystack/installer:latest" } \ No newline at end of file diff --git a/packages/extra/monitoring/templates/vm/vmalert-scrape.yaml b/packages/extra/monitoring/templates/vm/vmalert-scrape.yaml index 308a82e9..ee406a27 100644 --- a/packages/extra/monitoring/templates/vm/vmalert-scrape.yaml +++ b/packages/extra/monitoring/templates/vm/vmalert-scrape.yaml @@ -13,5 +13,5 @@ spec: selector: matchLabels: app.kubernetes.io/component: monitoring - app.kubernetes.io/instance: vmalertmanager + app.kubernetes.io/instance: vmalert app.kubernetes.io/name: vmalert diff --git a/packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml b/packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml index c4623511..7febc123 100644 --- a/packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml +++ b/packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml @@ -14,7 +14,7 @@ spec: selector: matchLabels: app.kubernetes.io/component: monitoring - app.kubernetes.io/instance: {{ $.Release.Name }}-{{ .name }} + app.kubernetes.io/instance: {{ .name }} app.kubernetes.io/name: vminsert --- apiVersion: operator.victoriametrics.com/v1beta1 diff --git a/packages/system/grafana-oncall/Chart.yaml b/packages/system/grafana-oncall/Chart.yaml index 60b35803..03573358 100644 --- a/packages/system/grafana-oncall/Chart.yaml +++ b/packages/system/grafana-oncall/Chart.yaml @@ -1,2 +1,2 @@ -name: grafana-oncall -version: 0.1.0 +name: cozy-grafana-oncall +version: 1.0.0 diff --git a/packages/system/ingress-nginx/Chart.yaml b/packages/system/ingress-nginx/Chart.yaml index d6011181..4716918b 100644 --- a/packages/system/ingress-nginx/Chart.yaml +++ b/packages/system/ingress-nginx/Chart.yaml @@ -1,6 +1,2 @@ -apiVersion: v2 -name: ingress -description: NGINX Ingress Controller -icon: https://docs.nginx.com/nginx-ingress-controller/images/icons/NGINX-Ingress-Controller-product-icon.svg -type: application +name: cozy-ingress-nginx version: 1.0.0 diff --git a/packages/system/kamaji-etcd/Chart.yaml b/packages/system/kamaji-etcd/Chart.yaml index 60abbe31..c67b97e3 100644 --- a/packages/system/kamaji-etcd/Chart.yaml +++ b/packages/system/kamaji-etcd/Chart.yaml @@ -1,6 +1,2 @@ -apiVersion: v2 -name: etcd -description: Storage for Kubernetes clusters -icon: https://www.svgrepo.com/show/353714/etcd.svg -type: application +name: cozy-kamaji-etcd version: 1.0.0