From 05ec4dbb8381fdac8879309511fcb7f5d8aa7869 Mon Sep 17 00:00:00 2001 From: Brenda Rearden Date: Fri, 30 Jul 2021 10:26:58 -0700 Subject: [PATCH] Add cluster-tool annotation Add cluster-tool Monitoring Add cluster-tool annotation Alerting Drivers Add cluster-tool annotation CIS Benchmark Add cluster-tool annotation Istio Add cluster-tool annotation Logging Add cluster-tool annotation Longhorn Add cluster-tool annotation OPA Gatekeeper --- packages/longhorn/generated-changes/patch/Chart.yaml.patch | 3 ++- packages/rancher-alerting-drivers/charts/Chart.yaml | 1 + packages/rancher-cis-benchmark/charts/Chart.yaml | 1 + .../generated-changes/patch/Chart.yaml.patch | 3 ++- packages/rancher-istio/charts/Chart.yaml | 1 + .../rancher-logging/generated-changes/patch/Chart.yaml.patch | 3 ++- .../generated-changes/patch/Chart.yaml.patch | 5 +++-- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/longhorn/generated-changes/patch/Chart.yaml.patch b/packages/longhorn/generated-changes/patch/Chart.yaml.patch index 19acca68c..e2a0874c8 100644 --- a/packages/longhorn/generated-changes/patch/Chart.yaml.patch +++ b/packages/longhorn/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -27,3 +27,12 @@ +@@ -27,3 +27,13 @@ - name: Longhorn maintainers email: maintainers@longhorn.io icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/longhorn/icon/color/longhorn-icon-color.png @@ -8,6 +8,7 @@ + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: longhorn-system + catalog.cattle.io/release-name: longhorn ++ catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: longhorn + catalog.cattle.io/provides-gvr: longhorn.io/v1beta1 + catalog.cattle.io/display-name: "Longhorn" diff --git a/packages/rancher-alerting-drivers/charts/Chart.yaml b/packages/rancher-alerting-drivers/charts/Chart.yaml index 0b0d4aada..3ea3c5b9d 100644 --- a/packages/rancher-alerting-drivers/charts/Chart.yaml +++ b/packages/rancher-alerting-drivers/charts/Chart.yaml @@ -1,6 +1,7 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/display-name: Alerting Drivers + catalog.cattle.io/type: cluster-tool catalog.cattle.io/os: linux catalog.cattle.io/release-name: rancher-alerting-drivers apiVersion: v2 diff --git a/packages/rancher-cis-benchmark/charts/Chart.yaml b/packages/rancher-cis-benchmark/charts/Chart.yaml index 376fe733c..1f39422b7 100644 --- a/packages/rancher-cis-benchmark/charts/Chart.yaml +++ b/packages/rancher-cis-benchmark/charts/Chart.yaml @@ -10,6 +10,7 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/namespace: cis-operator-system catalog.cattle.io/release-name: rancher-cis-benchmark + catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: rancher-cis-benchmark catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1 catalog.cattle.io/display-name: "CIS Benchmark" diff --git a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch index 235e040fd..a687f6d1c 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,10 +1,21 @@ +@@ -1,10 +1,22 @@ apiVersion: v2 appVersion: v3.5.1 -description: A Helm chart for Gatekeeper @@ -19,6 +19,7 @@ + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: cattle-gatekeeper-system + catalog.cattle.io/release-name: rancher-gatekeeper ++ catalog.cattle.io/type: cluster-tool + catalog.cattle.io/provides-gvr: config.gatekeeper.sh.config/v1alpha1 + catalog.cattle.io/display-name: "OPA Gatekeeper" + catalog.cattle.io/ui-component: gatekeeper diff --git a/packages/rancher-istio/charts/Chart.yaml b/packages/rancher-istio/charts/Chart.yaml index e3cff4d03..6fde1aa74 100644 --- a/packages/rancher-istio/charts/Chart.yaml +++ b/packages/rancher-istio/charts/Chart.yaml @@ -11,6 +11,7 @@ annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/namespace: istio-system catalog.cattle.io/release-name: rancher-istio + catalog.cattle.io/type: cluster-tool catalog.cattle.io/ui-component: istio catalog.cattle.io/provides-gvr: networking.istio.io.virtualservice/v1beta1 catalog.cattle.io/auto-install: rancher-kiali-server-crd=100.0.0+up1.35.0 diff --git a/packages/rancher-logging/generated-changes/patch/Chart.yaml.patch b/packages/rancher-logging/generated-changes/patch/Chart.yaml.patch index 41c599866..0761c63ab 100644 --- a/packages/rancher-logging/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-logging/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,5 +1,18 @@ +@@ -1,5 +1,19 @@ apiVersion: v1 appVersion: 3.12.0 -description: A Helm chart to install Banzai Cloud logging-operator @@ -17,6 +17,7 @@ + catalog.cattle.io/certified: rancher + catalog.cattle.io/namespace: cattle-logging-system + catalog.cattle.io/release-name: rancher-logging ++ catalog.cattle.io/type: cluster-tool + catalog.cattle.io/ui-component: logging + catalog.cattle.io/provides-gvr: logging.banzaicloud.io.clusterflow/v1beta1 + catalog.cattle.io/display-name: "Logging" diff --git a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch index 9f92e82a2..89c47b28a 100644 --- a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch @@ -36,7 +36,7 @@ annotations: artifacthub.io/links: | - name: Chart Source -@@ -5,8 +37,15 @@ +@@ -5,8 +37,16 @@ - name: Upstream Project url: https://github.com/prometheus-operator/kube-prometheus artifacthub.io/operator: "true" @@ -48,13 +48,14 @@ + catalog.cattle.io/ui-component: monitoring + catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1 + catalog.cattle.io/display-name: "Monitoring" ++ catalog.cattle.io/type: cluster-tool + catalog.cattle.io/auto-install: rancher-monitoring-crd=match + catalog.cattle.io/requests-cpu: "4500m" + catalog.cattle.io/requests-memory: "4000Mi" dependencies: - condition: grafana.enabled name: grafana -@@ -71,34 +110,6 @@ +@@ -71,34 +111,6 @@ - condition: rkeScheduler.enabled name: rkeScheduler repository: file://./charts/rkeScheduler