From 276341b1f98ddc8a81b06e588077f90fec21d0f4 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 2 Feb 2024 10:46:10 +0100 Subject: [PATCH] add icons Signed-off-by: Andrei Kvapil --- .../core/platform/templates/helmrepos.yaml | 1 - packages/extra/Makefile | 2 +- packages/extra/addresses/Chart.yaml | 3 --- packages/extra/addresses/templates/pools.yaml | 22 ------------------- packages/extra/addresses/values.yaml | 7 ------ packages/extra/etcd/Chart.yaml | 6 ++++- packages/extra/grafana-oncall/Chart.yaml | 2 +- packages/extra/ingress/Chart.yaml | 6 ++++- packages/extra/monitoring/Chart.yaml | 4 ++-- packages/extra/versions_map | 9 ++++---- 10 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 packages/extra/addresses/Chart.yaml delete mode 100644 packages/extra/addresses/templates/pools.yaml delete mode 100644 packages/extra/addresses/values.yaml diff --git a/packages/core/platform/templates/helmrepos.yaml b/packages/core/platform/templates/helmrepos.yaml index 106ffaf7..3e061e41 100644 --- a/packages/core/platform/templates/helmrepos.yaml +++ b/packages/core/platform/templates/helmrepos.yaml @@ -28,7 +28,6 @@ metadata: name: cozystack-extra namespace: cozy-public labels: - cozystack.io/ui: "true" cozystack.io/repository: extra spec: interval: 5m0s diff --git a/packages/extra/Makefile b/packages/extra/Makefile index 3fca8d36..bd5c1d26 100644 --- a/packages/extra/Makefile +++ b/packages/extra/Makefile @@ -11,7 +11,7 @@ repo: rm -rf "$(TMP)" fix-chartnames: - find . -name Chart.yaml -maxdepth 2 | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: cozy-$$i/" "$$i/Chart.yaml"; done + find . -name Chart.yaml -maxdepth 2 | awk -F/ '{print $$2}' | while read i; do sed -i "s/^name: .*/name: $$i/" "$$i/Chart.yaml"; done gen-versions-map: fix-chartnames ../../hack/gen_versions_map.sh diff --git a/packages/extra/addresses/Chart.yaml b/packages/extra/addresses/Chart.yaml deleted file mode 100644 index 5959f7d6..00000000 --- a/packages/extra/addresses/Chart.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v2 -name: cozy-addresses -version: 1.0.0 diff --git a/packages/extra/addresses/templates/pools.yaml b/packages/extra/addresses/templates/pools.yaml deleted file mode 100644 index 175d24d2..00000000 --- a/packages/extra/addresses/templates/pools.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: metallb.io/v1beta1 -kind: IPAddressPool -metadata: - name: {{ .Release.Namespace }} - namespace: cozy-metallb -spec: - autoAssign: false - addresses: - {{- range .Values.pools }} - - {{ . }} - {{- end }} ---- -apiVersion: metallb.io/v1beta1 -kind: L2Advertisement -metadata: - name: {{ .Release.Namespace }} - namespace: cozy-metallb -spec: - ipAddressPools: - {{- range .Values.pools }} - - {{ . }} - {{- end }} diff --git a/packages/extra/addresses/values.yaml b/packages/extra/addresses/values.yaml deleted file mode 100644 index 093f3549..00000000 --- a/packages/extra/addresses/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Specify IP address pools for use by other applicaions: -# -# pools: -# - 192.168.101.200-192.168.101.250 -# - 192.168.102.0/24 - -pools: [] diff --git a/packages/extra/etcd/Chart.yaml b/packages/extra/etcd/Chart.yaml index 3f2430ae..ce7fbdc5 100644 --- a/packages/extra/etcd/Chart.yaml +++ b/packages/extra/etcd/Chart.yaml @@ -1,2 +1,6 @@ -name: cozy-etcd +apiVersion: v2 +name: etcd +description: Persistent storage for Kubernetes clusters +icon: https://www.svgrepo.com/show/353714/etcd.svg +type: application version: 1.0.0 diff --git a/packages/extra/grafana-oncall/Chart.yaml b/packages/extra/grafana-oncall/Chart.yaml index 51716aa2..60b35803 100644 --- a/packages/extra/grafana-oncall/Chart.yaml +++ b/packages/extra/grafana-oncall/Chart.yaml @@ -1,2 +1,2 @@ -name: cozy-grafana-oncall +name: grafana-oncall version: 0.1.0 diff --git a/packages/extra/ingress/Chart.yaml b/packages/extra/ingress/Chart.yaml index 2b71f695..d6011181 100644 --- a/packages/extra/ingress/Chart.yaml +++ b/packages/extra/ingress/Chart.yaml @@ -1,2 +1,6 @@ -name: cozy-ingress +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 version: 1.0.0 diff --git a/packages/extra/monitoring/Chart.yaml b/packages/extra/monitoring/Chart.yaml index 210b74ab..dbfa5374 100644 --- a/packages/extra/monitoring/Chart.yaml +++ b/packages/extra/monitoring/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: cozy-monitoring +name: monitoring description: Monitoring and observability stack icon: https://www.svgrepo.com/download/184787/analytics-laptop.svg type: application -version: 0.1.0 +version: 1.0.0 diff --git a/packages/extra/versions_map b/packages/extra/versions_map index c9059bc4..08963d9f 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -1,5 +1,4 @@ -cozy-addresses 1.0.0 HEAD -cozy-etcd 1.0.0 HEAD -cozy-grafana-oncall 0.1.0 HEAD -cozy-ingress 1.0.0 HEAD -cozy-monitoring 0.1.0 HEAD +etcd 1.0.0 HEAD +grafana-oncall 0.1.0 HEAD +ingress 1.0.0 HEAD +monitoring 1.0.0 HEAD