From 6622fb40a5cdcb14aeb316c338755d30327d3324 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 1 Nov 2023 14:46:43 -0700 Subject: [PATCH] Add feature label Signed-off-by: Tamal Saha --- .../apps/cert-manager/cert-manager.yaml | 2 ++ .../templates/apps/kubedb/kubedb.yaml | 2 ++ .../apps/kubeops/external-dns-operator.yaml | 2 ++ .../templates/apps/kubeops/kube-ui-server.yaml | 2 ++ .../apps/kubeops/license-proxyserver.yaml | 2 ++ .../templates/apps/kubeops/reloader.yaml | 2 ++ .../apps/monitoring/kube-prometheus-stack.yaml | 2 ++ .../templates/apps/monitoring/panopticon.yaml | 2 ++ .../templates/apps/stash/stash.yaml | 2 ++ .../templates/repositories/repositories.yaml | 2 ++ .../opscenter-core/opscenter-features.yaml | 16 ++++++++-------- .../featuresets/opscenter-tools/sidekick.yaml | 2 +- .../templates/repositories/repositories.yaml | 2 ++ 13 files changed, 31 insertions(+), 9 deletions(-) diff --git a/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml b/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml index fd64610ab..df6d7eccb 100644 --- a/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml +++ b/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml @@ -24,6 +24,8 @@ kind: HelmRelease metadata: name: cert-manager namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: cert-manager spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/kubedb/kubedb.yaml b/charts/ace-installer/templates/apps/kubedb/kubedb.yaml index 5eebf2248..8a1ba3534 100644 --- a/charts/ace-installer/templates/apps/kubedb/kubedb.yaml +++ b/charts/ace-installer/templates/apps/kubedb/kubedb.yaml @@ -15,6 +15,8 @@ kind: HelmRelease metadata: name: kubedb namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: kubedb spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml b/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml index b28073cf5..b048b2e18 100644 --- a/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml +++ b/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml @@ -11,6 +11,8 @@ kind: HelmRelease metadata: name: external-dns-operator namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: external-dns-operator spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml b/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml index 70a81e23a..31bc57ee1 100644 --- a/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml +++ b/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml @@ -11,6 +11,8 @@ kind: HelmRelease metadata: name: kube-ui-server namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: kube-ui-server spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml b/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml index 02b9a7174..6c15ff1ea 100644 --- a/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml +++ b/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml @@ -11,6 +11,8 @@ kind: HelmRelease metadata: name: license-proxyserver namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: license-proxyserver spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/kubeops/reloader.yaml b/charts/ace-installer/templates/apps/kubeops/reloader.yaml index ca953ea69..be74afb0d 100644 --- a/charts/ace-installer/templates/apps/kubeops/reloader.yaml +++ b/charts/ace-installer/templates/apps/kubeops/reloader.yaml @@ -16,6 +16,8 @@ kind: HelmRelease metadata: name: reloader namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: reloader spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml b/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml index 54805cefa..0491b49fd 100644 --- a/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml +++ b/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml @@ -91,6 +91,8 @@ kind: HelmRelease metadata: name: kube-prometheus-stack namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: kube-prometheus-stack spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/monitoring/panopticon.yaml b/charts/ace-installer/templates/apps/monitoring/panopticon.yaml index 2f847aeae..3705fbf97 100644 --- a/charts/ace-installer/templates/apps/monitoring/panopticon.yaml +++ b/charts/ace-installer/templates/apps/monitoring/panopticon.yaml @@ -11,6 +11,8 @@ kind: HelmRelease metadata: name: panopticon namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: panopticon spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/apps/stash/stash.yaml b/charts/ace-installer/templates/apps/stash/stash.yaml index d2d25b50d..abd556132 100644 --- a/charts/ace-installer/templates/apps/stash/stash.yaml +++ b/charts/ace-installer/templates/apps/stash/stash.yaml @@ -20,6 +20,8 @@ kind: HelmRelease metadata: name: stash namespace: {{ $.Release.Namespace }} + labels: + ace.appscode.com/feature: stash spec: interval: 5m timeout: 30m diff --git a/charts/ace-installer/templates/repositories/repositories.yaml b/charts/ace-installer/templates/repositories/repositories.yaml index 3f384dbad..88217302e 100644 --- a/charts/ace-installer/templates/repositories/repositories.yaml +++ b/charts/ace-installer/templates/repositories/repositories.yaml @@ -8,6 +8,8 @@ kind: HelmRepository metadata: name: {{ $name }} namespace: {{ $.Release.Namespace }} + labels: + kubernetes.io/metadata.name: {{ $name }} spec: {{- with $cfg.url }} url: {{ . }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-core/opscenter-features.yaml b/charts/opscenter-features/templates/featuresets/opscenter-core/opscenter-features.yaml index a5befbd5c..0fbe38038 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-core/opscenter-features.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-core/opscenter-features.yaml @@ -14,14 +14,14 @@ spec: featureSet: opscenter-core featureBlock: opscenter-features recommended: false - # readinessChecks: - # workloads: - # - group: helm.toolkit.fluxcd.io - # version: v2beta1 - # kind: HelmRelease - # selector: - # app.kubernetes.io/managed-by: Helm - # ace.appscode.com/feature: opscenter-features + readinessChecks: + workloads: + - group: source.toolkit.fluxcd.io + version: v1beta2 + kind: HelmRepository + selector: + app.kubernetes.io/managed-by: Helm + kubernetes.io/metadata.name: appscode-charts-oci chart: name: opscenter-features namespace: kubeops diff --git a/charts/opscenter-features/templates/featuresets/opscenter-tools/sidekick.yaml b/charts/opscenter-features/templates/featuresets/opscenter-tools/sidekick.yaml index 20fb9f67a..259e5dc0c 100644 --- a/charts/opscenter-features/templates/featuresets/opscenter-tools/sidekick.yaml +++ b/charts/opscenter-features/templates/featuresets/opscenter-tools/sidekick.yaml @@ -18,7 +18,7 @@ spec: type: image/svg+xml featureSet: opscenter-tools featureBlock: sidekick - recommended: false + recommended: true readinessChecks: workloads: - group: apps diff --git a/charts/opscenter-features/templates/repositories/repositories.yaml b/charts/opscenter-features/templates/repositories/repositories.yaml index b8d81b029..7634df218 100644 --- a/charts/opscenter-features/templates/repositories/repositories.yaml +++ b/charts/opscenter-features/templates/repositories/repositories.yaml @@ -4,6 +4,8 @@ kind: HelmRepository metadata: name: {{ $name }} namespace: {{ $.Release.Namespace }} + labels: + kubernetes.io/metadata.name: {{ $name }} spec: {{- with $cfg.url }} url: {{ . }}